Merge "USB: Fix bug in ext_chg_active flag handling"