Merge "Obtain correct screenshot based on device orientation" into rvc-dev