Merge "Fix flag guarding for oneGridRotationHandling" into main