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