Merge "Change a11y shortcut default lockscreen behavior"