Merge "Reorder USB_STATE updates so config_changed is not replaced."