Merge "Fix task bar crashing in small screen with task bar / nav bar unification on" into main