Merge "OOUIHTMLForm: Correctly handle submit modifier flags"