Merge "Fix BottomNavigationView not saving state" into nyc-support-25.2-dev