Merge "Don't use physical orientation to compute area for screenshot"