Merge "Removing some shortcut mappings that didn't make to UDC in system info" into udc-dev