Merge "Add a proper ripple for TabLayout tab" into sc-dev