[automerger skipped] Merge "Get screencap working correctly in landscape mode" into pi-dev am: e06ad77bdd
am: b9fd62498a  -s ours

Change-Id: I90a530304dcf4b77434b99217897d63a3dee5f20