Merge "Hide usb mode chooser dialog after disconnected"