Merge "Improve shortcut handling."