Merge "Back out TintResources changes DO NOT MERGE ANYWHERE" into mnc-ub-dev