Merge "MTP: Fix typo that resulted in the MTP provider returning thumb format for object format"