Merge "Avoid race condition with hotseat predictions."