Merge "Fix renaming file and moving file issue in MTP" into rvc-qpr-dev