Merge "Dissable allow rotation when oneGridSpecs flag is on" into main