Merge "Don't hold on to AssetManager instances" into nyc-dev