Merge "MTP host fixes:"