Merge "Introduce SelectUsbConfigPreferenceController"