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