Merge "rdbms: clean up DBO_TRX behavior for onTransactionPreCommitOrIdle()"