Merge "DISALLOW_USB_FILE_TRANSFER update user restrictions" into sc-dev