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

* commit '5c9f0987fce29a78f79429947c00b14f5a8b4504':
  Fix blank lockscreen #3