Merge "Crashing can not override Keyguard transit" into pi-dev