Merge "LunarLander: Fix race condition causing crash on exit"