Merge "UsbService: Make sure the USB accessory function is disabled when we disconnect"