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