Merge "Revert change to rotateBounds" into main