Backport #6631

Backport #6631 to 3-2-stable so we can use `FormHelper#button` method with a block.