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
Change-Id: I6da3bacf759729b14ffe992e33281b3945a4268a