Port e3cfccb2060 to blaze-refactor.

Stop not updating form controls if they're focused.