Merge "Make display size of test have consistent orientation" into main