Merge "HTMLFormFieldWithButton: Allow passing 'inputtype' and pass through 'buttonid'"