Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev