Merge "Don't close USB type notification when USB is connected to USB devices." into nyc-dev