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

* commit '80b7ccb67a630f982ca9ba7e742dab4f85e6e741':
  Nav bar: fix tablet density change issues

Change-Id: I32bd76024b07abbaf437c12d8b2a443d743a5969