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

* commit '52448f381cfdd08bda31bc38e193a661e01c9626':
  HWC2: Track move of transform into Geometry