Merge "UsbService: USB connected notification now redirects to USB screen in Settings"