Merge "Correct recently introduced logic error in seamless rotation detection." into nyc-mr1-dev am: 1553d5411c am: 708d218468
am: 4c1d0797bc

Change-Id: I25f0793e6315ca0ff06fdabc46c52859ca0f8fbe