am a94d2c54: am 5c9f0987: am 85701394: am a359df01: am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev

* commit 'a94d2c5442275c38e585c93babd297bb24ee65c4':
  Fix blank lockscreen #3