Merge "Have nav bar handle density changes"