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: eb7f8663
Change-Id: Ib4e51a01ce636ae81f068c68bebc5cca03b396d3