Merge changes I99f18930,I5f6830d8 into nyc-mr1-dev

* changes:
  Prevent any rotation while seamless rotation is pending.
  Prevent triggering orientation changes until previous completes.