Merged stabilization/2106 -> development (resolved merge conflicts).

Signed-off-by: Chris Galvan <chgalvan@amazon.com>

Code/Framework/AzQtComponents/AzQtComponents/Components/FancyDocking.cpp

@@ -3288,15 +3288,20 @@ namespace AzQtComponents
         }
 
         // Untab tabbed dock widgets before restoring, as the restore only works on dock widgets parented directly to the main window
-        const QList<QDockWidget*> dockWidgets = m_mainWindow->findChildren<QDockWidget*>();
-        for (QDockWidget* dockWidget : dockWidgets)
+        for (QDockWidget* dockWidget : m_mainWindow->findChildren<QDockWidget*>(
+            QRegularExpression(QString("%1.*").arg(m_tabContainerIdentifierPrefix)), Qt::FindChildrenRecursively))
         {
-            if (QStackedWidget* stackedWidget = qobject_cast<QStackedWidget*>(dockWidget->parentWidget()))
+            DockTabWidget* tabWidget = qobject_cast<DockTabWidget*>(dockWidget->widget());
+            if (!tabWidget)
             {
-                if (AzQtComponents::DockTabWidget* tabWidget = qobject_cast<AzQtComponents::DockTabWidget*>(stackedWidget->parentWidget()))
-                {
-                    tabWidget->removeTab(dockWidget);
-                }
+                continue;
+            }
+
+            // Remove the tabs from the tab widget (we don't actually want to close them, which could delete them at this point)
+            int numTabs = tabWidget->count();
+            for (int i = 0; i < numTabs; ++i)
+            {
+                tabWidget->removeTab(0);
             }
         }
 

Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp

@@ -1303,6 +1303,10 @@ namespace AzQtComponents
             }
             break;
 
+            case QStyle::SP_MessageBoxInformation:
+                return QIcon(QString::fromUtf8(":/stylesheet/img/UI20/Info.svg"));
+                break;
+
             default:
                 break;
         }

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/BaseStyleSheet.qss

@@ -123,6 +123,7 @@ QPlainTextEdit:focus
 @import "LineEdit.qss";
 @import "Menu.qss";
 @import "MenuBar.qss";
+@import "MessageBox.qss";
 @import "ProgressBar.qss";
 @import "PushButton.qss";
 @import "QDockWidget.qss";

Code/Framework/AzQtComponents/AzQtComponents/Components/Widgets/MessageBox.qss

@@ -0,0 +1,21 @@
+
+/*
+ * Copyright (c) Contributors to the Open 3D Engine Project
+ * 
+ * SPDX-License-Identifier: Apache-2.0 OR MIT
+ *
+ */
+
+ /* correct the padding around the two main labels to give space at the borders */
+QMessageBox QLabel#qt_msgbox_label
+{
+    padding-top: 20px;
+    padding-right: 20px;
+    padding-bottom: 20px;
+}
+
+QMessageBox QLabel#qt_msgboxex_icon_label
+{
+    padding-left: 20px;
+    padding-top: 20px;
+}

Code/Framework/AzQtComponents/AzQtComponents/Components/resources.qrc

@@ -354,17 +354,17 @@
     <file>img/UI20/toolbar/Grid.svg</file>
     <file>img/UI20/toolbar/Lighting.svg</file>
     <file>img/UI20/toolbar/Load.svg</file>
-	<file>img/UI20/toolbar/Local.svg</file>
+    <file>img/UI20/toolbar/Local.svg</file>
     <file>img/UI20/toolbar/Locked.svg</file>
     <file>img/UI20/toolbar/Locked_Status.svg</file>
-	<file>img/UI20/toolbar/LUA.svg</file>
+    <file>img/UI20/toolbar/LUA.svg</file>
     <file>img/UI20/toolbar/Material.svg</file>
     <file>img/UI20/toolbar/Measure.svg</file>
     <file>img/UI20/toolbar/Move.svg</file>
     <file>img/UI20/toolbar/Object_follow_terrain.svg</file>
     <file>img/UI20/toolbar/Object_height.svg</file>
     <file>img/UI20/toolbar/Object_list.svg</file>
-	<file>img/UI20/toolbar/Parent.svg</file>
+    <file>img/UI20/toolbar/Parent.svg</file>
     <file>img/UI20/toolbar/particle.svg</file>
     <file>img/UI20/toolbar/Play.svg</file>
     <file>img/UI20/toolbar/Redo.svg</file>
@@ -385,7 +385,7 @@
     <file>img/UI20/toolbar/undo.svg</file>
     <file>img/UI20/toolbar/Unlocked.svg</file>
     <file>img/UI20/toolbar/Vertex_snapping.svg</file>
-	<file>img/UI20/toolbar/World.svg</file>
+    <file>img/UI20/toolbar/World.svg</file>
     <file>img/UI20/toolbar/X_axis.svg</file>
     <file>img/UI20/toolbar/Y_axis.svg</file>
     <file>img/UI20/toolbar/Z_axis.svg</file>
@@ -459,6 +459,7 @@
     <file>Widgets/ComboBoxConfig.ini</file>
     <file>Widgets/Menu.qss</file>
     <file>Widgets/MenuBar.qss</file>
+    <file>Widgets/MessageBox.qss</file>
     <file>Widgets/ProgressBarConfig.ini</file>
     <file>Widgets/ProgressBar.qss</file>
     <file>Widgets/PushButton.qss</file>