Merge "Unify fastScrollSpace, freeScroll and scrollingOffset naming." into mnc-ub-dev