Merge "Handle custom key gestures added by the user" into main