Merge "Ensure split-screen support isn't reported on devices with small displays."