Merge "Handle null buffer when calling Transaction::setBuffer" into tm-dev