Merge "Cleanup split screen offset in TaskViewSimulator" into sc-v2-dev