Merge "Fix input regression affecting HTMLForms that use VForm"