Merge "Put nested scroll logic in a separate modifier" into main