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