Merge "Get screencap working correctly in landscape mode"