Merge "Revert "Fix attempt for  TaplTwoPanelWorkspaceTest#testSinglePageDragIconWhenMultiplePageScrollingIsPossible"" into main