Merge "Only adjust min/max scroll for split screen in landscape" into sc-v2-dev