Merge "Test should handle both device orientations" into sc-v2-dev