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: e6d99f13 am: 6b53dd99
Change-Id: I6fc953e2b7d7c36bf85f21e82a1b9df2dcee0b64