Merge "Adjust the layout of nav buttons in 3 button mode with task bar / nav bar unification" into main