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

Change-Id: I2651fdaf9473c0a3dfe767cd3320bf311305983a