am f8a2ba51: Merge "Prevent unexpected rotation while going back to keyguard"

* commit 'f8a2ba511ee2dc5360f323c71eff5e0f2465dd99':
  Prevent unexpected rotation while going back to keyguard