Merge "Revert "Revert "Enable manage mode for ExternalStorageProvider when called from Files""" into rvc-dev