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