Merge "Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c am: 26070158" into nyc-mr2-dev-plus-aosp