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

Change-Id: I7c00d18135567ee7bfae0cde7c4cc960bfc4bce6