Merge "CtsVerifier: Camera: Use separate picture size for orientation test" into sc-dev