Merge "Fix race condition bug related to freezing apps. am: 41d2be0f am: a025a0cd" into nyc-mr2-dev-plus-aosp am: 143c96ce Change-Id: Iffe5af2a1588c3918fd074ed2936d25d1d6e40f3