Merge "Flips the flag to turn on RotationResolver by default." into sc-dev