Merge "Check split screen properly." into nyc-mr2-dev