Merge "Fix issue where turning off fixed landscape goes to default grid" into main