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