Merge "Fix TabLayout flickering" into nyc-support-24.1-dev