Merge "Fix description of MTP option in the "Use USB for" dialog." into nyc-dev