Merge "rdbms: Ensure onTransactionPreCommitOrIdle() callbacks don't lead transactions"