Merge "Fix tile benchmark tool stalls"