Merge "EnhancedChangesList: Use one TemplateParser instance"