Merge "Size hotseat data structure appropriately." into jb-ub-now-kermit