Merge "Fix constant redrawing on Keyguard issue." into lmp-dev