Merge "Creating the transaction on the UI thread" into tm-dev