Merge "Keyguard: Don't lock when phone process crashes" into pi-dev