Merge "Fix "launcher starting on work profile"" into oc-dev am: b6d1a19819
am: b5c6c3daa7

Change-Id: I228d7efd8c283882bb2d431b87ae73da01000156