Merge "Revert "Fix jank resulting from TaskView resizing"" into main