Merge "Reset screenshot timeout immediately" into main