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

Change-Id: If90a9beb0d948faedc91bfe9edaab146471d85a0