Merge "Fix task menu height calculation for bottom row handling." into main