Merge "Rely on presense of divider target to determine split screen state" into sc-v2-dev