Merge "AssetManager2: Various fixes"