Merge "Trigger on scroll callback if position changes during a layout" into lmp-mr1-dev