Merge "Update GameServiceTest to verify screenshot saved" into tm-dev