Merge "Avoid removing USB state changes during CONFIGURED uevent"