Merge "Tethering: Delay 1000ms before processing USB disconnect events"