Merge pull request #10519 from jordan-woyak/fix-hotkey-detections MappingCommon: Fix detection of hotkey and conjunction expressions.
