Renaming as preparation to introduce ScrollDiffMargin
Introduce a first version of Scroll Diff Margin