Merge "Fix ModifierShortcutTests" into udc-dev