Merge "Make nested scrolling tests depend less on implementation" into main