Merge "Mount ptp separately from mtp" into pi-dev