Merge "Fix for GestureShortcutOptionControllerTest" into main