Merge "Shortcut Helper - Go to physical keyboard settings when button clicked" into main