Merge "Just broadcast intent to bring up MTP/PTP as soon as switching function" into oc-dev