Merge "Prevent unexpected rotation while going back to keyguard"