Merge "Update navigation bar upon change of display density" am: f46b14b6af
am: 87401e095d

Change-Id: I26fcdf1866f4a600af026e2fed4e6dccd435dd2e