Merge "Get screencap working correctly in landscape mode" into pi-dev