Merge "Fix preserveLegacyExternalStorage logic" into rvc-dev