Merge "Don't unfreeze too early" into qt-r1-dev
am: 31c862e17e

Change-Id: Id9b072da32aada717753b0b4066e6a05df023035