Merge "Do not show task bar edu in folded state with task bar / nav bar unification" into main