Merge "Add timeout to loading boost on game state change"