am 733bf7bd: Merge "Attempt to fix invisible Keyguard #2" into lmp-dev

* commit '733bf7bd9a834df719ac10c79d7044a16e5af968':
  Attempt to fix invisible Keyguard #2