Merge "Make sure we preserve preserveLegacyExternalStorage." into rvc-qpr-dev