Merge "Only add 2nd screen by default for split display" into sc-v2-dev