am 23f07789: am 3c6300da: am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev

* commit '23f0778983b511f7dece86515f59aca251db1053':
  Fix blank Keyguard #4