Merge "Fix TabLayout text size issue" into nyc-dev