Merge "Shift block shortcuts before KeyGestureController" into main