Merge pull request #9115 from jordan-woyak/default-modifiers Core: Unbreak default keyboard mappings.