Merge "Make large task tile snap to position after scrolling" into main