Merge "Using the right context when in FixedLandscape" into main