Merge "USB: Make MTP/PTP toggle in the USB preferences set the default mode"