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

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