Merge "Revert "Using Transaction directly instead of building surface p..."" into tm-qpr-dev