Merge "Revert^2 "Removing unused surface transaction wrappers"" into tm-qpr-dev