Merge "Use AutoCommitUpdate instead of Database->onTransactionIdle"