Merge "Refactor smooth scrolling sub-row calculation and clamp target"