Merge changes I653b84e7,Ieafdc14a into nyc-dev

* changes:
  Apply position updates immediately.
  Move crop outside of geometry state.