Merge "MTP: fix a memory leak" into sc-dev