Merge "Make sure we always use the provide Tab text colors" into lmp-mr1-ub-dev