Merge "HWC2: Track move of transform into Geometry" into nyc-dev