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