Merge "Fix Hotseat stashing  on user going to dream" into main