Merge "Make bottom navigation item pool non-static" into nyc-support-25.2-dev am: b30e76d2a8
am: 359813b63d

Change-Id: Ie58d93e69827a65ce75115553006f733fa5688b7