Merge "Enable RTL support in keyguard" into klp-dev