Merge "Ensure GameSession is not destroyed when restarting game." into tm-dev