Merge "Nav bar: fix tablet density change issues" into nyc-dev