Merge "Latch transform with geometry state." into nyc-dev
am: fb47fe7d27

* commit 'fb47fe7d27aa8a0adcccf311b6a5ab4cab4fd49d':
  Latch transform with geometry state.