Fix race condition bug related to freezing apps. am: 41d2be0f0f
am: 453efdc065

Change-Id: I879874943a30db52cfb91d5902126c275cf2ecac