Merge "If necessary, re-create game session when game task is focused." into tm-dev