cherry-picks: UMS/MTP switch