Merge "Fix TabLayout setSelection() issues with custom views DO NOT MERGE ANYWHERE" into nyc-dev