Merge "Fix TabLayout setSelection() issues with custom views"