Merge "HTMLFormFieldWithButton: Don't pass empty string as 'id'"