Merge "Refactor getNewGameMode()" into tm-dev