Merge "Fix scroll task off screen to support different screen dimensions." into sc-v2-dev