Merge "Show a line below the tabs in tabbed view to align with UX mocks."