Merge "MtpStorage: correct the size of reserve space for MTP"