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

Change-Id: I516c8ea2dacd261a2323890e5232115f79edea49