Merge "Adding some shortcut mappings back to shortcut helper since these have been implemented since UDC" into main