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