Merge "Remove AssetLoader from customization lib" into main