Merge "Skip dialog to unlock private space while launching apps" into main