Merge "Merge "Nav bar: fix tablet density change issues" into nyc-dev am: 6c2bc3db95 am: 80b7ccb67a" into nyc-mr1-dev-plus-aosp