Merge "AssetManager: Guard against null in array retrieval"