Merge "Apply/reset split scroll offset regardless of previous state" into sc-v2-dev