Merge "Check split screen properly." into nyc-mr2-dev
am: 632332c259

Change-Id: I2d69e69b9e00d076f2707a690137d5278fd2107c