Merge "Fix leaky view tags"