Merge "Fix ExternalStorageProvider always throw exception when rename"