Merge "Remove different layout for landscape in Keyguard" into lmp-dev