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

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