Merge "[res] Refactor AssetManager + Providers"