Merge "Fix task bar crash in gesture nav mode with task bar / nav bar unification on" into main