Merge "Split ASurfaceTransaction_setGeometry api" into sc-dev