Merge "Do not intercept Escape with modifiers" into main