Merge "Revert "Make TintResources inherit from ResourcesWrapper"" into mnc-ub-dev