Merge "Add more fixes to BottomNavigationView." into nyc-support-24.1-dev