Merge "Change color of the tab underline to match the UX mocks."