Merge changes I653b84e7,Ieafdc14a into nyc-dev
am: abddf72

* commit 'abddf727041d2ea0e678442b2d7905afc8b33bd4':
  Apply position updates immediately.
  Move crop outside of geometry state.

Change-Id: I7d4b9d49f6807748592c32432e4ab80da59bad37