Merge "Remove configure() from Mtp" into pi-dev