Merge "Fix inconsistency when dropping to hotseat"