Merge "Don't unfreeze too early" into qt-r1-dev