Merge "Fix race condition bug related to freezing apps." into cw-f-dev am: 3350ae9c82 am: 2607015861
am: f997be08ba

Change-Id: I35930617f0aed984ab5ee8286396948d6a9f7831