Merge "Revert "[res] Duplicate AssetManager when changes are needed"" into main