Merge "moved strings in KeyGestureType to label map to resources" into main