Merge "Stop scaring the kids when USB is connected."