Merge pull request #2538 from Armada651/thread-revert Revert "Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before."
