Merge branch 'main' of https://github.com/GSA/notifications-admin into 718-clean-up-components-section

# Conflicts:
#	app/templates/components/components/footer/_footer.scss
#	app/templates/components/components/hint/_hint.scss
#	app/templates/views/service-settings/data-retention.html
#	app/templates/views/service-settings/sms-senders.html
#	app/templates/views/two-factor-webauthn.html
#	app/templates/views/user-profile/security-keys.html

app/templates/views/api/callbacks/delivery-status-callback.html

@@ -14,8 +14,8 @@
 {% endblock %}
 
 {% block maincolumn_content %}
-  <div class="govuk-grid-row">
-    <div class="govuk-grid-column-five-sixths">
+  <div class="grid-row">
+    <div class="grid-col-10">
 
       {{ page_header('Callbacks for delivery receipts') }}
 

app/templates/views/api/callbacks/received-text-messages-callback.html

@@ -14,8 +14,8 @@
 
 {% block maincolumn_content %}
   {{ page_header('Callbacks for received text messages') }}
-  <div class="govuk-grid-row">
-    <div class="govuk-grid-column-five-sixths">
+  <div class="grid-row">
+    <div class="grid-col-10">
       <p>
         When you receive a text message in Notify, we can forward it to your system.
         Check the <a class="usa-link" href="{{ url_for('.callbacks') }}"> callback documentation </a> for more information.