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

* commit '6c2bc3db95dde4e4dff9d04266c3b87c8a6af306':
  Nav bar: fix tablet density change issues

Change-Id: I1a78b8cc86c3fef24cdddbd07c0dfafb61bca471