Merge "Obtain correct screenshot based on device orientation" into rvc-dev am: 538ee89f2b

Change-Id: I5b46e2f85dc074bbf0f835c6b7332eb5f36ade2d