Merge "Make onTransactionPreCommitOrIdle() atomic when immediate"