Merge "Enable and disable usb IpServer according to ACTION_USB_STATE"