Merge "Check for null buffer when calling Transaction#setBuffer" into tm-dev