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

Change-Id: I063eeb4d5252d5559065aaa4c6e430962b8e73de