Merge "AssetManager2: Fix list function"