Issue #3121913 by DamienMcKenna, swatichouhan012: Fixed missing type hints for some $form, $form_state variables.