Merge "Fix Settings app crash for devices with no USB support."