Merge "Crashing can not override Keyguard transit" into pi-dev
am: 44121059dc

Change-Id: Ieb020e920e1417d501f12bf7b5c2c57437685d9c