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