am 6dc68cab: Merge "Fix Keyguard crash when in landscape." into lmp-preview-dev

* commit '6dc68cab1858bc899fb3209c61dc86a813e7b8ff':
  Fix Keyguard crash when in landscape.