Merge "Revert: Add checkbox to enable PTP USB mode."