Merge "Show launcher when profile is locked immediately" into nyc-dev