Merge "Use NDK version of transaction completed callback" into 24D1-dev