Merge "Fix issue with split screen launch bounds" into pi-dev