CRM-15151 - Ensure form errors always close when popup form submitted