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

Change-Id: I9e12db9f686c934a2e2d391d80a0c1bb26398c7f