Merge "Fix quick settings on Keyguard" into lmp-mr1-dev