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