Merge "Make onTransactionIdle() safer for multi-DB commits"