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

Change-Id: Ia1f4349217b2baca92678c74d20196a3b332f008