am 62d3158f: am bc015e84: am dbc31105: Merge "Disable keyguard text marquee when the display turns off." into klp-dev

* commit '62d3158f9ea4678bf2a668508ede3d7f98823a9e':
  Disable keyguard text marquee when the display turns off.