Revert "Revert "Add option for switching between UMS and MTP/PTP mode. (2/2)""

This reverts commit 89cc3e81e48df7aeee1c0d58b9eda37a892e9114.