Merge "Back out TintResources changes" into nyc-dev