Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev