Merge "Revert "Add sys.usb.mtp.batchcancel to usb_config_prop"" into sc-dev