Merge "Obtain correct screenshot based on device orientation" into rvc-dev am: 538ee89f am: b3e68624 Change-Id: If70ac74e9baf8b5651784b5edaa44eb7f623e133