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

* commit '3c6300da713a7407a3fcfba126ef912ea7bc21bc':
  Fix blank Keyguard #4