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