Merge "Fix screenshot not showing up on subsequent screenshots" into tm-dev