Merge "Remove unnecessary nestedScrollToScene modifiers" into main