Merge "mtp: fix double free of thumbnail data" into nyc-dev