Merge "Performance improvements in AssetManager" into nyc-dev