Merge "Do not crash if attempt to launch app from locked profile" into rvc-dev...
Merge "Do not crash if attempt to launch app from locked profile" into rvc-dev am: 763285e5 am: 1b5efdd9 am: 9f7fbce9 am: b72503b3
Change-Id: Id18bf691f95fffe78a006a593dc1fc91f3c660a4