Merge "Waiting for the apps-unfreeze flags instead of enforcing it" into tm-qpr-dev