Fix templating block (bug 940571)

This moves the block extra_content so it works for the bounce screen which extends from base rather than from pin_form.