Merge "Update navigation bar upon change of display density"