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

Change-Id: I5c9d6770f8f3343fc41650ec4de2696fada0ee19