Issue #2940527 by stanislav.nikolov, rjacobsen0: Add suffix to the form_id for forms displayed as blocks