Merge "Correctly apply scrollY" into sc-v2-dev