Merge "Fix "launcher starting on work profile"" into oc-dev