Merge "Fix accessibility for all-caps items in keyguard" into klp-dev