Merge "Fix stack overflow from setOwnScrollY" into sc-dev