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

* commit '6791ad68c8e325fe330e495d10bdf86efa0450de':
  Attempt to fix invisible Keyguard #2