Merge "Refactoring A11y shortcut functions in Settings to use GESTURE" into main