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

Change-Id: Iff322d51519896e8795a4aaa5b85ac810cea7c95