am 70968134: Merge "Fix invisible Keyguard" into lmp-dev

* commit '70968134205bcaf97076b84f5fda9ee867aa21e5':
  Fix invisible Keyguard