Merge "Honoring @PortraitLandscape annotation in presubmit" into main