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

Change-Id: I0baace4fdbb236d1f423d7b407be06c6deb47bb5