Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev