Merge "database: make close() sanity check mTrxPreCommitCallbacks"