Merge "Run the configure method when mtp or ptp is enabled."