Merge "Enforce calling HTMLForm::prepareForm before displayForm"