Merge "HTMLForm: Improve hidden field handling"