Merge "If running in presubmit, ignore @PortraitLandscape annotation. It's important to keep presubmits fast even if we will occasionally miss regressions in presubmit." into main