Merge "Fix task bar transitions applied to unfolded task bar" into main