Merge "Remove some overdraw in Keyguard" into lmp-dev