Merge branch 'main' into hultonha_LYN-2315_camera-phase-2

2021-04-28 17:29:24 +01:00
parent e05ab8bfb7 5d53590434
commit f24e3b2891
88 changed files with 389 additions and 281 deletions
@@ -10,91 +10,75 @@
 *
 */

-#include "ByteStreamSerializer.h"
-
 #include <AzCore/Casting/numeric_cast.h>
 #include <AzCore/Memory/SystemAllocator.h>
+#include <AzCore/Serialization/Json/ByteStreamSerializer.h>
 #include <AzCore/Serialization/Json/JsonSerialization.h>
 #include <AzCore/StringFunc/StringFunc.h>

 namespace AZ
 {
-    namespace ByteSerializerInternal
-    {
-        static JsonSerializationResult::Result Load(void* outputValue, const rapidjson::Value& inputValue, JsonDeserializerContext& context)
-        {
-            using JsonSerializationResult::Outcomes;
-            using JsonSerializationResult::Tasks;
-
-            AZ_Assert(outputValue, "Expected a valid pointer to load from json value.");
-
-            switch (inputValue.GetType())
-            {
-            case rapidjson::kStringType: {
-                JsonByteStream buffer;
-                if (AZ::StringFunc::Base64::Decode(buffer, inputValue.GetString(), inputValue.GetStringLength()))
-                {
-                    JsonByteStream* valAsByteStream = static_cast<JsonByteStream*>(outputValue);
-                    *valAsByteStream = AZStd::move(buffer);
-                    return context.Report(Tasks::ReadField, Outcomes::Success, "Successfully read ByteStream.");
-                }
-                return context.Report(Tasks::ReadField, Outcomes::Invalid, "Decode of Base64 encoded ByteStream failed.");
-            }
-            case rapidjson::kArrayType:
-            case rapidjson::kObjectType:
-            case rapidjson::kNullType:
-            case rapidjson::kFalseType:
-            case rapidjson::kTrueType:
-            case rapidjson::kNumberType:
-                return context.Report(
-                    Tasks::ReadField, Outcomes::Unsupported,
-                    "Unsupported type. ByteStream values cannot be read from arrays, objects, nulls, booleans or numbers.");
-            default:
-                return context.Report(Tasks::ReadField, Outcomes::Unknown, "Unknown json type encountered for ByteStream value.");
-            }
-        }
-
-        static JsonSerializationResult::Result StoreWithDefault(
-            rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue, JsonSerializerContext& context)
-        {
-            using JsonSerializationResult::Outcomes;
-            using JsonSerializationResult::Tasks;
-
-            const JsonByteStream& valAsByteStream = *static_cast<const JsonByteStream*>(inputValue);
-            if (context.ShouldKeepDefaults() || !defaultValue || (valAsByteStream != *static_cast<const JsonByteStream*>(defaultValue)))
-            {
-                const auto base64ByteStream = AZ::StringFunc::Base64::Encode(valAsByteStream.data(), valAsByteStream.size());
-                outputValue.SetString(base64ByteStream.c_str(), base64ByteStream.size(), context.GetJsonAllocator());
-                return context.Report(Tasks::WriteValue, Outcomes::Success, "ByteStream successfully stored.");
-            }
-
-            return context.Report(Tasks::WriteValue, Outcomes::DefaultsUsed, "Default ByteStream used.");
-        }
-    } // namespace ByteSerializerInternal
-
    AZ_CLASS_ALLOCATOR_IMPL(JsonByteStreamSerializer, SystemAllocator, 0);

    JsonSerializationResult::Result JsonByteStreamSerializer::Load(
        void* outputValue, [[maybe_unused]] const Uuid& outputValueTypeId, const rapidjson::Value& inputValue,
        JsonDeserializerContext& context)
    {
+        using JsonSerializationResult::Outcomes;
+        using JsonSerializationResult::Tasks;
+
        AZ_Assert(
            azrtti_typeid<JsonByteStream>() == outputValueTypeId,
            "Unable to deserialize AZStd::vector<AZ::u8>> to json because the provided type is %s",
            outputValueTypeId.ToString<AZStd::string>().c_str());
+        AZ_Assert(outputValue, "Expected a valid pointer to load from json value.");

-        return ByteSerializerInternal::Load(outputValue, inputValue, context);
+        switch (inputValue.GetType())
+        {
+        case rapidjson::kStringType: {
+            JsonByteStream buffer;
+            if (AZ::StringFunc::Base64::Decode(buffer, inputValue.GetString(), inputValue.GetStringLength()))
+            {
+                JsonByteStream* valAsByteStream = static_cast<JsonByteStream*>(outputValue);
+                *valAsByteStream = AZStd::move(buffer);
+                return context.Report(Tasks::ReadField, Outcomes::Success, "Successfully read ByteStream.");
+            }
+            return context.Report(Tasks::ReadField, Outcomes::Invalid, "Decode of Base64 encoded ByteStream failed.");
+        }
+        case rapidjson::kArrayType:
+        case rapidjson::kObjectType:
+        case rapidjson::kNullType:
+        case rapidjson::kFalseType:
+        case rapidjson::kTrueType:
+        case rapidjson::kNumberType:
+            return context.Report(
+                Tasks::ReadField, Outcomes::Unsupported,
+                "Unsupported type. ByteStream values cannot be read from arrays, objects, nulls, booleans or numbers.");
+        default:
+            return context.Report(Tasks::ReadField, Outcomes::Unknown, "Unknown json type encountered for ByteStream value.");
+        }
    }

    JsonSerializationResult::Result JsonByteStreamSerializer::Store(
        rapidjson::Value& outputValue, const void* inputValue, const void* defaultValue, [[maybe_unused]] const Uuid& valueTypeId,
        JsonSerializerContext& context)
    {
+        using JsonSerializationResult::Outcomes;
+        using JsonSerializationResult::Tasks;
+
        AZ_Assert(
            azrtti_typeid<JsonByteStream>() == valueTypeId,
            "Unable to serialize AZStd::vector<AZ::u8> to json because the provided type is %s",
            valueTypeId.ToString<AZStd::string>().c_str());

-        return ByteSerializerInternal::StoreWithDefault(outputValue, inputValue, defaultValue, context);
+        const JsonByteStream& valAsByteStream = *static_cast<const JsonByteStream*>(inputValue);
+        if (context.ShouldKeepDefaults() || !defaultValue || (valAsByteStream != *static_cast<const JsonByteStream*>(defaultValue)))
+        {
+            const auto base64ByteStream = AZ::StringFunc::Base64::Encode(valAsByteStream.data(), valAsByteStream.size());
+            outputValue.SetString(base64ByteStream.c_str(), base64ByteStream.size(), context.GetJsonAllocator());
+            return context.Report(Tasks::WriteValue, Outcomes::Success, "ByteStream successfully stored.");
+        }
+
+        return context.Report(Tasks::WriteValue, Outcomes::DefaultsUsed, "Default ByteStream used.");
    }
 } // namespace AZ
@@ -24,5 +24,5 @@ QProgressBar

 QProgressBar::chunk
 {
-    background: #54AFD0;
+    background: #1E70EB;
 }
@@ -13,14 +13,14 @@ Width=24;
 ArrowWidth=10;

 [PrimaryColorSet]
-Disabled\Start=#7092A7
-Disabled\End=#7092A7
-Sunken\Start=#0073BB
-Sunken\End=#0073BB
-Hovered\Start=#44BAFF
-Hovered\End=#4AB2F8
+Disabled\Start=#2A4875
+Disabled\End=#2A4875
+Sunken\Start=#1E70EB
+Sunken\End=#1E70EB
+Hovered\Start=#4ABAFF
+Hovered\End=#94D2FF
 Normal\Start=#0095F2
-Normal\End=#0073BB
+Normal\End=#1E70EB

 [SecondaryColorSet]
 Disabled\Start=#666666
@@ -42,10 +42,10 @@ Color=#3D000000

 [FocusedBorder]
 Thickness=1
-Color=#00A1C9
+Color=#4B8CEF

 [IconButton]
-ActiveColor=#00A1C9
+ActiveColor=#1E70EB
 DisabledColor=#999999
 SelectedColor=#FFFFFF

@@ -12,7 +12,7 @@ HandleBorder\Color=#FFFFFF
 HandleBorder\Radius=1.5

 [Slider]
-Handle\Color=#0185D7
+Handle\Color=#1E70EB
 Handle\ColorDisabled=#999999
 Handle\Size=12
 Handle\SizeMinusMargin=8
@@ -46,7 +46,7 @@ namespace AzQtComponents
    Text::Config Text::defaultConfig()
    {
        Config config;
-        config.hyperlinkColor = QStringLiteral("#44B2F8");
+        config.hyperlinkColor = QStringLiteral("#94D2FF");

        return config;
    }
@@ -1,2 +1,2 @@
 [Hyperlink]
-Color=#44B2F8
+Color=#94D2FF
@@ -4,7 +4,7 @@
    <title>Selection Controls / Checkbox / Off</title>
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Checkbox-/-Off" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="checkbox-(off)" stroke="#00A1C9">
+        <g id="checkbox-(off)" stroke="#4B8CEF">
            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape"></path>
        </g>
    </g>
@@ -5,7 +5,7 @@
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Checkbox-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="checkbox-(on)">
-            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#7092A7"></path>
+            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#2A4875"></path>
            <polygon id="Path" fill="#BBBBBB" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
        </g>
    </g>
@@ -5,7 +5,7 @@
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Checkbox-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="checkbox-(on)">
-            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#4B8CEF" fill="#1E70EB"></path>
            <polygon id="Path" fill="#FFFFFF" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
        </g>
    </g>
@@ -5,7 +5,7 @@
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Checkbox-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="checkbox-(on)">
-            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#0073BB"></path>
+            <path d="M1.77777778,0 C0.8,0 0,0.8 0,1.77777778 L0,14.2222222 C0,15.2 0.8,16 1.77777778,16 L14.2222222,16 C15.2,16 16,15.2 16,14.2222222 L16,1.77777778 C16,0.8 15.2,0 14.2222222,0 L1.77777778,0 Z" id="Shape" fill="#1E70EB"></path>
            <polygon id="Path" fill="#FFFFFF" points="1 8.19230769 2.4 6.84615385 6 10.3076923 13.6 3 15 4.34615385 6 13"></polygon>
        </g>
    </g>
@@ -5,7 +5,7 @@
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="Group">
-            <rect id="Rectangle-10" fill="#7092A7" x="0" y="0" width="16" height="16" rx="2"></rect>
+            <rect id="Rectangle-10" fill="#2A4875" x="0" y="0" width="16" height="16" rx="2"></rect>
            <rect id="Rectangle-9" fill="#BBBBBB" x="3" y="7" width="10" height="2"></rect>
        </g>
    </g>
@@ -5,7 +5,7 @@
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="Group">
-            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M14.2222222,0.5 L1.77777778,0.5 C1.07614237,0.5 0.5,1.07614237 0.5,1.77777778 L0.5,14.2222222 C0.5,14.9238576 1.07614237,15.5 1.77777778,15.5 L14.2222222,15.5 C14.9238576,15.5 15.5,14.9238576 15.5,14.2222222 L15.5,1.77777778 C15.5,1.07614237 14.9238576,0.5 14.2222222,0.5 Z" id="Shape" stroke="#4B8CEF" fill="#1E70EB"></path>
            <rect id="Rectangle-9" fill="#FFFFFF" x="3" y="7" width="10" height="2"></rect>
        </g>
    </g>
@@ -5,7 +5,7 @@
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Checkbox-/-Partial-Selected" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="Group">
-            <rect id="Rectangle-10" fill="#0073BB" x="0" y="0" width="16" height="16" rx="2"></rect>
+            <rect id="Rectangle-10" fill="#1E70EB" x="0" y="0" width="16" height="16" rx="2"></rect>
            <rect id="Rectangle-9" fill="#FFFFFF" x="3" y="7" width="10" height="2"></rect>
        </g>
    </g>
@@ -4,7 +4,7 @@
    <title>Selection Controls / Radio Button / On - Disabled</title>
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Radio-Button-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <circle id="Oval" fill="#7092A7" cx="8" cy="8" r="8"></circle>
+        <circle id="Oval" fill="#2A4875" cx="8" cy="8" r="8"></circle>
        <circle id="Oval" fill="#BBBBBB" cx="8" cy="8" r="4"></circle>
    </g>
 </svg>
@@ -4,7 +4,7 @@
    <title>Selection Controls / Radio Button / On-focus</title>
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Radio-Button-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <circle id="Oval" stroke="#00A1C9" fill="#0073BB" cx="9" cy="9" r="8.5"></circle>
+        <circle id="Oval" stroke="#4B8CEF" fill="#1E70EB" cx="9" cy="9" r="8.5"></circle>
        <circle id="Oval" fill="#FFFFFF" cx="9" cy="9" r="4"></circle>
    </g>
 </svg>
@@ -5,7 +5,7 @@
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Radio-Button-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="radio-button-(on)">
-            <circle id="Oval" fill="#0073BB" cx="8" cy="8" r="8"></circle>
+            <circle id="Oval" fill="#1E70EB" cx="8" cy="8" r="8"></circle>
            <circle id="Oval" fill="#FFFFFF" cx="8" cy="8" r="4"></circle>
        </g>
    </g>
@@ -4,7 +4,7 @@
    <title>Selection Controls / Radio Button / Off-focus</title>
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Radio-Button-/-Off-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="radio-button-(off)" transform="translate(1.000000, 1.000000)" stroke="#00A1C9">
+        <g id="radio-button-(off)" transform="translate(1.000000, 1.000000)" stroke="#4B8CEF">
            <circle id="Oval" cx="8" cy="8" r="8.5"></circle>
        </g>
    </g>
@@ -5,7 +5,7 @@
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Switch-/-On---Disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="switch-(on)">
-            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#7092A7"></path>
+            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#2A4875"></path>
            <circle id="knob" fill="#BBBBBB" cx="24" cy="8" r="6"></circle>
        </g>
    </g>
@@ -5,7 +5,7 @@
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Switch-/-On-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="switch-(on)" transform="translate(1.000000, 1.000000)">
-            <path d="M25.4117647,16.5 L6.58823529,16.5 C2.61773665,16.5 -0.5,12.7141769 -0.5,8 C-0.5,3.28582307 2.61773665,-0.5 6.58823529,-0.5 L25.4117647,-0.5 C29.3822634,-0.5 32.5,3.28582307 32.5,8 C32.5,12.7141769 29.3822634,16.5 25.4117647,16.5 Z" id="track" stroke="#00A1C9" fill="#0073BB"></path>
+            <path d="M25.4117647,16.5 L6.58823529,16.5 C2.61773665,16.5 -0.5,12.7141769 -0.5,8 C-0.5,3.28582307 2.61773665,-0.5 6.58823529,-0.5 L25.4117647,-0.5 C29.3822634,-0.5 32.5,3.28582307 32.5,8 C32.5,12.7141769 29.3822634,16.5 25.4117647,16.5 Z" id="track" stroke="#4B8CEF" fill="#1E70EB"></path>
            <circle id="knob" fill="#FFFFFF" cx="24" cy="8" r="6"></circle>
        </g>
    </g>
@@ -5,7 +5,7 @@
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Switch-/-On" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="switch-(on)">
-            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#0073BB"></path>
+            <path d="M25.4117647,16 L6.58823529,16 C2.91764706,16 0,12.4571429 0,8 C0,3.54285714 2.91764706,0 6.58823529,0 L25.4117647,0 C29.0823529,0 32,3.54285714 32,8 C32,12.4571429 29.0823529,16 25.4117647,16 Z" id="track" fill="#1E70EB"></path>
            <circle id="knob" fill="#FFFFFF" cx="24" cy="8" r="6"></circle>
        </g>
    </g>
@@ -5,7 +5,7 @@
    <desc>Created with Sketch.</desc>
    <g id="Selection-Controls-/-Switch-/-Off-focus" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <g id="switch-(off)" transform="translate(1.000000, 1.000000)">
-            <path d="M25.0231909,16.5 L7.01632718,16.5 C2.97419648,16.5 -0.5,12.6299076 -0.5,8 C-0.5,3.37009242 2.97419648,-0.5 7.01632718,-0.5 L25.0231909,-0.5 C29.0586432,-0.5 32.5,3.36297526 32.5,8 C32.5,12.6370247 29.0586432,16.5 25.0231909,16.5 Z" id="track" stroke="#00A1C9"></path>
+            <path d="M25.0231909,16.5 L7.01632718,16.5 C2.97419648,16.5 -0.5,12.6299076 -0.5,8 C-0.5,3.37009242 2.97419648,-0.5 7.01632718,-0.5 L25.0231909,-0.5 C29.0586432,-0.5 32.5,3.36297526 32.5,8 C32.5,12.6370247 29.0586432,16.5 25.0231909,16.5 Z" id="track" stroke="#4B8CEF"></path>
            <circle id="knob" fill="#FFFFFF" cx="8" cy="8" r="6"></circle>
        </g>
    </g>
@@ -1,6 +1,6 @@
 <svg version="1.1" class="loader" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 width="40px" height="40px" viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
-  <path fill="#54AFD0" d="M43.935,25.145c0-10.318-8.364-18.683-18.683-18.683c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615c8.072,0,14.615,6.543,14.615,14.615H43.935z">
+  <path fill="#1E70EB" d="M43.935,25.145c0-10.318-8.364-18.683-18.683-18.683c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615c8.072,0,14.615,6.543,14.615,14.615H43.935z">
    <animateTransform attributeType="xml"
      attributeName="transform"
      type="rotate"
@@ -53,8 +53,8 @@ namespace AzToolsFramework
        static constexpr const char* FolderIconPath = "Editor/Icons/AssetBrowser/Folder_16.svg";
        static constexpr const char* GemIconPath = "Editor/Icons/AssetBrowser/GemFolder_16.svg";

-        FolderThumbnail::FolderThumbnail(SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        FolderThumbnail::FolderThumbnail(SharedThumbnailKey key)
+            : Thumbnail(key)
        {}

        void FolderThumbnail::LoadThread()
@@ -69,7 +69,8 @@ namespace AzToolsFramework
            AZStd::string absoluteIconPath;
            AZ::StringFunc::Path::Join(engineRoot, folderIcon, absoluteIconPath);

-            m_icon = QIcon(absoluteIconPath.c_str());
+            m_pixmap.load(absoluteIconPath.c_str());
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
        }

        //////////////////////////////////////////////////////////////////////////
@@ -47,7 +47,7 @@ namespace AzToolsFramework
        {
            Q_OBJECT
        public:
-            FolderThumbnail(SharedThumbnailKey key, int thumbnailSize);
+            FolderThumbnail(SharedThumbnailKey key);
            void LoadThread() override;
        };

@@ -57,8 +57,8 @@ namespace AzToolsFramework
        //////////////////////////////////////////////////////////////////////////
        static const char* DEFAULT_PRODUCT_ICON_PATH = "Editor/Icons/AssetBrowser/DefaultProduct_16.svg";

-        ProductThumbnail::ProductThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        ProductThumbnail::ProductThumbnail(Thumbnailer::SharedThumbnailKey key)
+            : Thumbnail(key)
        {}

        void ProductThumbnail::LoadThread() 
@@ -96,12 +96,8 @@ namespace AzToolsFramework
                iconPath = QString::fromUtf8(DEFAULT_PRODUCT_ICON_PATH);
            }

-            m_icon = QIcon(iconPath);
-
-            if (m_icon.isNull())
-            {
-                m_state = State::Failed;
-            }
+            m_pixmap.load(iconPath);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
        }

        //////////////////////////////////////////////////////////////////////////
@@ -44,7 +44,7 @@ namespace AzToolsFramework
        {
            Q_OBJECT
        public:
-            ProductThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+            ProductThumbnail(Thumbnailer::SharedThumbnailKey key);

        protected:
            void LoadThread() override;
@@ -58,8 +58,8 @@ namespace AzToolsFramework
        static constexpr const char* DefaultFileIconPath = "Editor/Icons/AssetBrowser/Default_16.svg";
        QMutex SourceThumbnail::m_mutex;

-        SourceThumbnail::SourceThumbnail(SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        SourceThumbnail::SourceThumbnail(SharedThumbnailKey key)
+            : Thumbnail(key)
        {
        }

@@ -124,7 +124,8 @@ namespace AzToolsFramework
                iconPathToUse = iconPath.c_str();
            }

-            m_icon = QIcon(iconPathToUse);
+            m_pixmap.load(iconPathToUse);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
        }

        //////////////////////////////////////////////////////////////////////////
@@ -44,7 +44,7 @@ namespace AzToolsFramework
        {
            Q_OBJECT
        public:
-            SourceThumbnail(SharedThumbnailKey key, int thumbnailSize);
+            SourceThumbnail(SharedThumbnailKey key);

        protected:
            void LoadThread() override;
@@ -140,7 +140,7 @@ namespace AzToolsFramework
            else
            {
                // Scaling and centering pixmap within bounds to preserve aspect ratio
-                const QPixmap pixmap = thumbnail->GetPixmap(size).scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+                const QPixmap pixmap = thumbnail->GetPixmap().scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
                const QSize sizeDelta = size - pixmap.size();
                const QPoint pointDelta = QPoint(sizeDelta.width() / 2, sizeDelta.height() / 2);
                painter->drawPixmap(point + pointDelta, pixmap);
@@ -36,8 +36,7 @@ namespace AzToolsFramework
            using namespace Thumbnailer;
            using namespace AssetBrowser;
            const char* contextName = "MaterialBrowser";
-            int thumbnailSize = qApp->style()->pixelMetric(QStyle::PM_SmallIconSize);
-            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterContext, contextName, thumbnailSize);
+            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterContext, contextName);
            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(FolderThumbnailCache), contextName);
            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(SourceThumbnailCache), contextName);
            ThumbnailerRequestsBus::Broadcast(&ThumbnailerRequests::RegisterThumbnailProvider, MAKE_TCACHE(MaterialThumbnailCache), contextName);
@@ -24,8 +24,8 @@ namespace AzToolsFramework
        //////////////////////////////////////////////////////////////////////////
        // MaterialThumbnail
        //////////////////////////////////////////////////////////////////////////
-        MaterialThumbnail::MaterialThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        MaterialThumbnail::MaterialThumbnail(Thumbnailer::SharedThumbnailKey key)
+            : Thumbnail(key)
        {
            auto productKey = azrtti_cast<const AzToolsFramework::AssetBrowser::ProductThumbnailKey*>(m_key.data());
            AZ_Assert(productKey, "Incorrect key type, excpected ProductThumbnailKey");
@@ -34,7 +34,8 @@ namespace AzToolsFramework
            MaterialBrowserRequestBus::BroadcastResult(multiMat, &MaterialBrowserRequests::IsMultiMaterial, productKey->GetAssetId());

            QString iconPath = multiMat ? MultiMaterialIconPath : SimpleMaterialIconPath;
-            m_pixmap = QPixmap(iconPath).scaled(m_thumbnailSize, m_thumbnailSize, Qt::KeepAspectRatio);
+            m_pixmap.load(iconPath);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
        }

        //////////////////////////////////////////////////////////////////////////
@@ -28,7 +28,7 @@ namespace AzToolsFramework
        {
            Q_OBJECT
        public:
-            MaterialThumbnail(Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+            MaterialThumbnail(Thumbnailer::SharedThumbnailKey key);
        };

        namespace
@@ -18,13 +18,15 @@ namespace AzToolsFramework
 {
    namespace Thumbnailer
    {
+        static constexpr const int LoadingThumbnailSize = 128;
+
        //////////////////////////////////////////////////////////////////////////
        // LoadingThumbnail
        //////////////////////////////////////////////////////////////////////////
        static const char* LoadingIconPath = "Editor/Icons/AssetBrowser/in_progress.gif";

-        LoadingThumbnail::LoadingThumbnail(int thumbnailSize)
-            : Thumbnail(MAKE_TKEY(ThumbnailKey), thumbnailSize)
+        LoadingThumbnail::LoadingThumbnail()
+            : Thumbnail(MAKE_TKEY(ThumbnailKey))
            , m_angle(0)
        {
            const char* engineRoot = nullptr;
@@ -34,7 +36,7 @@ namespace AzToolsFramework
            AZ::StringFunc::Path::Join(engineRoot, LoadingIconPath, iconPath);
            m_loadingMovie.setFileName(iconPath.c_str());
            m_loadingMovie.setCacheMode(QMovie::CacheMode::CacheAll);
-            m_loadingMovie.setScaledSize(QSize(m_thumbnailSize, m_thumbnailSize));
+            m_loadingMovie.setScaledSize(QSize(LoadingThumbnailSize, LoadingThumbnailSize));
            m_loadingMovie.start();
            m_pixmap = m_loadingMovie.currentPixmap();
            m_state = State::Ready;
@@ -29,7 +29,7 @@ namespace AzToolsFramework
        {
            Q_OBJECT
        public:
-            explicit LoadingThumbnail(int thumbnailSize);
+            LoadingThumbnail();
            ~LoadingThumbnail() override;

            void UpdateTime(float /*deltaTime*/) override;
@@ -18,11 +18,11 @@ namespace AzToolsFramework
    {
        static const char* MISSING_ICON_PATH = "Editor/Icons/AssetBrowser/Default_16.svg";

-        MissingThumbnail::MissingThumbnail(int thumbnailSize)
-            : Thumbnail(MAKE_TKEY(ThumbnailKey), thumbnailSize)
+        MissingThumbnail::MissingThumbnail()
+            : Thumbnail(MAKE_TKEY(ThumbnailKey))
        {
-            m_icon = QIcon(MISSING_ICON_PATH);
-            m_state = State::Ready;
+            m_pixmap.load(MISSING_ICON_PATH);
+            m_state = m_pixmap.isNull() ? State::Failed : State::Ready;
        }

    } // namespace Thumbnailer
@@ -24,7 +24,7 @@ namespace AzToolsFramework
        {
            Q_OBJECT
        public:
-            explicit MissingThumbnail(int thumbnailSize);
+            MissingThumbnail();
        };
    } // namespace Thumbnailer
 } // namespace AzToolsFramework
@@ -69,8 +69,8 @@ namespace AzToolsFramework

        bool SourceControlThumbnail::m_readyForUpdate = true;

-        SourceControlThumbnail::SourceControlThumbnail(SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        SourceControlThumbnail::SourceControlThumbnail(SharedThumbnailKey key)
+            : Thumbnail(key)
        {
            const char* engineRoot = nullptr;
            AzFramework::ApplicationRequests::Bus::BroadcastResult(engineRoot, &AzFramework::ApplicationRequests::GetEngineRoot);
@@ -122,16 +122,16 @@ namespace AzToolsFramework
            {
                if (fileInfo.HasFlag(AzToolsFramework::SCF_Writeable))
                {
-                    m_icon = QIcon(m_writableIconPath.c_str());
+                    m_pixmap.load(m_writableIconPath.c_str());
                }
                else
                {
-                    m_icon = QIcon(m_nonWritableIconPath.c_str());
+                    m_pixmap.load(m_nonWritableIconPath.c_str());
                }
            }
            else
            {
-                m_icon = QIcon();
+                m_pixmap = QPixmap();
            }
            m_readyForUpdate = true;
            emit Updated();
@@ -55,7 +55,7 @@ namespace AzToolsFramework
        {
            Q_OBJECT
        public:
-            SourceControlThumbnail(SharedThumbnailKey key, int thumbnailSize);
+            SourceControlThumbnail(SharedThumbnailKey key);
            ~SourceControlThumbnail() override;

            //////////////////////////////////////////////////////////////////////////
@@ -24,8 +24,6 @@ namespace AzToolsFramework
 {
    namespace Thumbnailer
    {
-        static const int DefaultIconSize = 16;
-
        //////////////////////////////////////////////////////////////////////////
        // ThumbnailKey
        //////////////////////////////////////////////////////////////////////////
@@ -54,10 +52,9 @@ namespace AzToolsFramework
        //////////////////////////////////////////////////////////////////////////
        // Thumbnail
        //////////////////////////////////////////////////////////////////////////
-        Thumbnail::Thumbnail(SharedThumbnailKey key, int thumbnailSize)
+        Thumbnail::Thumbnail(SharedThumbnailKey key)
            : QObject()
            , m_state(State::Unloaded)
-            , m_thumbnailSize(thumbnailSize)
            , m_key(key)
        {
            connect(&m_watcher, &QFutureWatcher<void>::finished, this, [this]()
@@ -91,19 +88,9 @@ namespace AzToolsFramework
            }
        }

-        QPixmap Thumbnail::GetPixmap() const
+        const QPixmap& Thumbnail::GetPixmap() const
        {
-            return GetPixmap(QSize(DefaultIconSize, DefaultIconSize));
-        }
-
-        QPixmap Thumbnail::GetPixmap(const QSize& size) const
-        {
-            if (m_icon.isNull())
-            {
-                return m_pixmap;
-            }
-
-            return m_icon.pixmap(size);
+            return m_pixmap;
        }

        SharedThumbnailKey Thumbnail::GetKey() const
@@ -19,7 +19,6 @@ AZ_PUSH_DISABLE_WARNING(4127 4251 4800, "-Wunknown-warning-option") // 4127: con
                                                                    // 4800: 'int': forcing value to bool 'true' or 'false' (performance warning)
 #include <QObject>
 #include <QPixmap>
-#include <QIcon>
 #include <QFutureWatcher>
 AZ_POP_DISABLE_WARNING
 #endif
@@ -86,12 +85,11 @@ namespace AzToolsFramework
                Failed
            };

-            Thumbnail(SharedThumbnailKey key, int thumbnailSize);
+            Thumbnail(SharedThumbnailKey key);
            ~Thumbnail() override;
            bool operator == (const Thumbnail& other) const;
            void Load();
-            virtual QPixmap GetPixmap() const;
-            virtual QPixmap GetPixmap(const QSize& size) const;
+            const QPixmap& GetPixmap() const;
            virtual void UpdateTime(float /*deltaTime*/) {}
            SharedThumbnailKey GetKey() const;
            State GetState() const;
@@ -105,10 +103,8 @@ namespace AzToolsFramework
        protected:
            QFutureWatcher<void> m_watcher;
            State m_state;
-            int m_thumbnailSize;
            SharedThumbnailKey m_key;
            QPixmap m_pixmap;
-            QIcon m_icon;

            virtual void LoadThread() {}
        };
@@ -122,7 +118,6 @@ namespace AzToolsFramework
            ThumbnailProvider() = default;
            virtual ~ThumbnailProvider() = default;
            virtual bool GetThumbnail(SharedThumbnailKey key, SharedThumbnail& thumbnail) = 0;
-            virtual void SetThumbnailSize(int thumbnailSize) = 0;
            //! Priority identifies ThumbnailProvider order in ThumbnailContext
            //! Higher priority means this ThumbnailProvider will take precedence in generating a thumbnail when
            //! a supplied ThumbnailKey is supported by multiple providers.
@@ -185,10 +180,7 @@ namespace AzToolsFramework

            bool GetThumbnail(SharedThumbnailKey key, SharedThumbnail& thumbnail) override;

-            void SetThumbnailSize(int thumbnailSize) override;
-
        protected:
-            int m_thumbnailSize;
            AZStd::unordered_map<SharedThumbnailKey, SharedThumbnail, Hasher, EqualKey> m_cache;

            //! Check if thumbnail key is handled by this provider, overload in derived class
@@ -18,7 +18,6 @@ namespace AzToolsFramework
    {
        template <class ThumbnailType, class Hasher, class EqualKey>
        ThumbnailCache<ThumbnailType, Hasher, EqualKey>::ThumbnailCache()
-            : m_thumbnailSize(0)
        {
            BusConnect();
        }
@@ -49,17 +48,11 @@ namespace AzToolsFramework
            }
            if (IsSupportedThumbnail(key))
            {
-                thumbnail = QSharedPointer<ThumbnailType>(new ThumbnailType(key, m_thumbnailSize));
+                thumbnail = QSharedPointer<ThumbnailType>(new ThumbnailType(key));
                m_cache[key] = thumbnail;
                return true;
            }
            return false;
        }
-
-        template <class ThumbnailType, class Hasher, class EqualKey>
-        void ThumbnailCache<ThumbnailType, Hasher, EqualKey>::SetThumbnailSize(int thumbnailSize)
-        {
-            m_thumbnailSize = thumbnailSize;
-        }
    } // namespace Thumbnailer
 } // namespace AzToolsFramework
@@ -24,10 +24,9 @@ namespace AzToolsFramework
 {
    namespace Thumbnailer
    {
-        ThumbnailContext::ThumbnailContext(int thumbnailSize)
-            : m_missingThumbnail(new MissingThumbnail(thumbnailSize))
-            , m_loadingThumbnail(new LoadingThumbnail(thumbnailSize))
-            , m_thumbnailSize(thumbnailSize)
+        ThumbnailContext::ThumbnailContext()
+            : m_missingThumbnail(new MissingThumbnail())
+            , m_loadingThumbnail(new LoadingThumbnail())
            , m_threadPool(this)
        {
            ThumbnailContextRequestBus::Handler::BusConnect();
@@ -120,7 +119,6 @@ namespace AzToolsFramework
                return;
            }

-            providerToAdd->SetThumbnailSize(m_thumbnailSize);
            m_providers.insert(providerToAdd);
        }

@@ -45,9 +45,9 @@ namespace AzToolsFramework
        {
            Q_OBJECT
        public:
-            AZ_CLASS_ALLOCATOR(ThumbnailContext, AZ::SystemAllocator, 0)
+            AZ_CLASS_ALLOCATOR(ThumbnailContext, AZ::SystemAllocator, 0);

-            explicit ThumbnailContext(int thumbnailSize);
+            ThumbnailContext();
            ~ThumbnailContext() override;

            //! Is the thumbnail currently loading or is about to load.
@@ -82,8 +82,6 @@ namespace AzToolsFramework
            SharedThumbnail m_missingThumbnail;
            //! Default loading thumbnail used when thumbnail is found by is not yet generated
            SharedThumbnail m_loadingThumbnail;
-            //! Thumbnail size (width and height in pixels)
-            int m_thumbnailSize;
            //! There is only a limited number of threads on global threadPool, because there can be many thumbnails rendering at once
            //! an individual threadPool is needed to avoid deadlocks
            QThreadPool m_threadPool;
@@ -40,7 +40,7 @@ namespace AzToolsFramework
        {
        public:
            //! Add thumbnail context
-            virtual void RegisterContext(const char* contextName, int thumbnailSize) = 0;
+            virtual void RegisterContext(const char* contextName) = 0;

            //! Remove thumbnail context and all associated ThumbnailProviders
            virtual void UnregisterContext(const char* contextName) = 0;
@@ -32,8 +32,7 @@ namespace AzToolsFramework

        void ThumbnailerComponent::Activate()
        {
-            int thumbnailSize = qApp->style()->pixelMetric(QStyle::PM_SmallIconSize);
-            RegisterContext(ThumbnailContext::DefaultContext, thumbnailSize);
+            RegisterContext(ThumbnailContext::DefaultContext);
            BusConnect();
        }

@@ -62,10 +61,10 @@ namespace AzToolsFramework
            provided.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
        }

-        void ThumbnailerComponent::RegisterContext(const char* contextName, int thumbnailSize)
+        void ThumbnailerComponent::RegisterContext(const char* contextName)
        {
            AZ_Assert(m_thumbnails.find(contextName) == m_thumbnails.end(), "Context %s already registered", contextName);
-            m_thumbnails[contextName] = AZStd::make_shared<ThumbnailContext>(thumbnailSize);
+            m_thumbnails[contextName] = AZStd::make_shared<ThumbnailContext>();
        }

        void ThumbnailerComponent::UnregisterContext(const char* contextName)
@@ -43,7 +43,7 @@ namespace AzToolsFramework
            //////////////////////////////////////////////////////////////////////////
            // ThumbnailerRequests
            //////////////////////////////////////////////////////////////////////////
-            void RegisterContext(const char* contextName, int thumbnailSize) override;
+            void RegisterContext(const char* contextName) override;
            void UnregisterContext(const char* contextName) override;
            bool HasContext(const char* contextName) const override;
            void RegisterThumbnailProvider(SharedThumbnailProvider provider, const char* contextName) override;
@@ -85,8 +85,6 @@ namespace UnitTest
    {
        constexpr const char* contextName1 = "Context1";
        constexpr const char* contextName2 = "Context2";
-        constexpr int thumbnailSize1 = 128;
-        constexpr int thumbnailSize2 = 256;

        auto checkHasContext = [](const char* contextName)
        {
@@ -98,12 +96,12 @@ namespace UnitTest
        EXPECT_FALSE(checkHasContext(contextName1));
        EXPECT_FALSE(checkHasContext(contextName2));

-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);

        EXPECT_TRUE(checkHasContext(contextName1));
        EXPECT_FALSE(checkHasContext(contextName2));

-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2, thumbnailSize2);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2);

        EXPECT_TRUE(checkHasContext(contextName1));
        EXPECT_TRUE(checkHasContext(contextName2));
@@ -123,8 +121,6 @@ namespace UnitTest
    {
        constexpr const char* contextName1 = "Context1";
        constexpr const char* contextName2 = "Context2";
-        constexpr int thumbnailSize1 = 128;
-        constexpr int thumbnailSize2 = 256;

        auto checkHasContext = [](const char* contextName)
        {
@@ -133,8 +129,8 @@ namespace UnitTest
            return hasContext;
        };

-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2, thumbnailSize2);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName2);

        EXPECT_TRUE(checkHasContext(contextName1));
        EXPECT_TRUE(checkHasContext(contextName2));
@@ -149,12 +145,11 @@ namespace UnitTest
    TEST_F(ThumbnailerTests, ThumbnailerComponent_RegisterContextTwice_Assert)
    {
        constexpr const char* contextName1 = "Context1";
-        constexpr int thumbnailSize1 = 128;

-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);

        AZ_TEST_START_TRACE_SUPPRESSION;
-        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1, thumbnailSize1);
+        AzToolsFramework::Thumbnailer::ThumbnailerRequestBus::Broadcast(&AzToolsFramework::Thumbnailer::ThumbnailerRequests::RegisterContext, contextName1);
        AZ_TEST_STOP_TRACE_SUPPRESSION(1);
    }

@@ -26,7 +26,6 @@
 #include <AzGameFramework/Application/GameApplication.h>

 #include <CryLibrary.h>
-#include <IConsole.h>
 #include <ISystem.h>
 #include <ITimer.h>
 #include <LegacyAllocator.h>
@@ -46,6 +45,23 @@ extern "C" void CreateStaticModules(AZStd::vector<AZ::Module*>& modulesOut);

 namespace
 {
+    void ExecuteConsoleCommandFile(AzFramework::Application& application)
+    {
+        const AZStd::string_view customConCmdKey = "console-command-file";
+        const AZ::CommandLine* commandLine = application.GetCommandLine();
+        AZStd::size_t numSwitchValues = commandLine->GetNumSwitchValues(customConCmdKey);
+        if (numSwitchValues > 0)
+        {
+            // The expectations for command line parameters is that the "last one wins"
+            // That way it allows users and test scripts to override previous command line options by just listing them later on the invocation line
+            const AZStd::string& consoleCmd = commandLine->GetSwitchValue(customConCmdKey, numSwitchValues - 1);
+            if (!consoleCmd.empty())
+            {
+                AZ::Interface<AZ::IConsole>::Get()->ExecuteConfigFile(consoleCmd.c_str());
+            }
+        }
+    }
+
 #if AZ_TRAIT_LAUNCHER_USE_CRY_DYNAMIC_MODULE_HANDLE
    // mimics AZ::DynamicModuleHandle but uses CryLibrary under the hood,
    // which is necessary to properly load legacy Cry libraries on some platforms
@@ -637,7 +653,11 @@ namespace O3DELauncher
            if (gEnv && gEnv->pConsole)
            {
                // Execute autoexec.cfg to load the initial level
-                gEnv->pConsole->ExecuteString("exec autoexec.cfg");
+                AZ::Interface<AZ::IConsole>::Get()->ExecuteConfigFile("autoexec.cfg");
+
+                // Find out if console command file was passed 
+                // via --console-command-file=%filename% and execute it
+                ExecuteConsoleCommandFile(gameApplication);

                gEnv->pSystem->ExecuteCommandLine(false);

@@ -1509,10 +1509,10 @@ bool EditorViewportWidget::AddCameraMenuItems(QMenu* menu)
    }

    action = customCameraMenu->addAction(tr("Look through entity"));
-    AzToolsFramework::EntityIdList selectedEntityList;
-    AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntityList, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
-    action->setCheckable(selectedEntityList.size() > 0 || m_viewSourceType == ViewSourceType::AZ_Entity);
-    action->setEnabled(selectedEntityList.size() > 0 || m_viewSourceType == ViewSourceType::AZ_Entity);
+    bool areAnyEntitiesSelected = false;
+    AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(areAnyEntitiesSelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);
+    action->setCheckable(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
+    action->setEnabled(areAnyEntitiesSelected || m_viewSourceType == ViewSourceType::AZ_Entity);
    action->setChecked(m_viewSourceType == ViewSourceType::AZ_Entity);
    connect(action, &QAction::triggered, this, [this](bool isChecked)
        {
@@ -234,11 +234,8 @@ public:
    QPoint ViewportToWidget(const QPoint& point) const;
    QSize WidgetToViewport(const QSize& size) const;

-    /// Take raw input and create a final mouse interaction.
-    /// @attention Do not map **point** from widget to viewport explicitly,
-    /// this is handled internally by BuildMouseInteraction - just pass directly.
    AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
-        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point);
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;

    void SetPlayerPos()
    {
@@ -756,6 +756,7 @@ void MainWindow::InitActions()
    am->AddAction(ID_TOOLBAR_WIDGET_SNAP_GRID, QString());
    am->AddAction(ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE, QString());
    am->AddAction(ID_TOOLBAR_WIDGET_DEBUG_MODE, QString());
+    am->AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, QString());

    // File actions
    am->AddAction(ID_FILE_NEW, tr("New Level"))
@@ -1170,14 +1171,17 @@ void MainWindow::InitActions()
    am->AddAction(ID_AUDIO_REFRESH_AUDIO_SYSTEM, tr("Refresh Audio"))
        .Connect(&QAction::triggered, this, &MainWindow::OnRefreshAudioSystem);

-    // Fame actions
+    // Game actions
    am->AddAction(ID_VIEW_SWITCHTOGAME, tr("Play &Game"))
+        .SetIcon(QIcon(":/stylesheet/img/UI20/toolbar/Play.svg"))
        .SetShortcut(tr("Ctrl+G"))
        .SetToolTip(tr("Play Game (Ctrl+G)"))
        .SetStatusTip(tr("Activate the game input mode"))
        .SetApplyHoverEffect()
        .SetCheckable(true)
        .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdatePlayGame);
+    am->AddAction(ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL, tr("Play Console"))
+        .SetText(tr("Play Console"));
    am->AddAction(ID_SWITCH_PHYSICS, tr("Simulate"))
        .SetShortcut(tr("Ctrl+P"))
        .SetToolTip(tr("Simulate (Ctrl+P)"))
@@ -1489,6 +1493,14 @@ QToolButton* MainWindow::CreateDebugModeButton()
    return debugModeButton;
 }

+QWidget* MainWindow::CreateSpacerRightWidget()
+{
+    QWidget* spacer = new QWidget();
+    spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+    spacer->setVisible(true);
+    return spacer;
+}
+
 void MainWindow::InitEnvironmentModeMenu(CVarMenu* environmentModeMenu)
 {
    environmentModeMenu->clear();
@@ -2395,6 +2407,9 @@ QWidget* MainWindow::CreateToolbarWidget(int actionId)
    case ID_TOOLBAR_WIDGET_DEBUG_MODE:
        w = CreateDebugModeButton();
        break;
+    case ID_TOOLBAR_WIDGET_SPACER_RIGHT:
+        w = CreateSpacerRightWidget();
+        break; 
    default:
        qWarning() << Q_FUNC_INFO << "Unknown id " << actionId;
        return nullptr;
@@ -215,6 +215,7 @@ private:

    QWidget* CreateSnapToGridWidget();
    QWidget* CreateSnapToAngleWidget();
+    QWidget* CreateSpacerRightWidget();

    QToolButton* CreateUndoRedoButton(int command);

@@ -238,11 +238,8 @@ public:
    QPoint ViewportToWidget(const QPoint& point) const;
    QSize WidgetToViewport(const QSize& size) const;

-    /// Take raw input and create a final mouse interaction.
-    /// @attention Do not map **point** from widget to viewport explicitly,
-    /// this is handled internally by BuildMouseInteraction - just pass directly.
    AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
-        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point);
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point) override;

    void SetPlayerPos()
    {
@@ -397,4 +397,6 @@
 #define ID_TOOLBAR_WIDGET_SNAP_GRID          50008
 #define ID_TOOLBAR_WIDGET_ENVIRONMENT_MODE   50011
 #define ID_TOOLBAR_WIDGET_DEBUG_MODE         50012
+#define ID_TOOLBAR_WIDGET_SPACER_RIGHT       50013
+#define ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL  50014
 #define ID_TOOLBAR_WIDGET_LAST               50020
@@ -511,6 +511,7 @@ void ToolbarManager::InitializeStandardToolbars()
        m_standardToolbars.reserve(5 + macroToolbars.size());
        m_standardToolbars.push_back(GetEditModeToolbar());
        m_standardToolbars.push_back(GetObjectToolbar());
+        m_standardToolbars.push_back(GetPlayConsoleToolbar());

        IPlugin* pGamePlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{71CED8AB-54E2-4739-AA78-7590A5DC5AEB}");
        IPlugin* pDescriptionEditorPlugin = GetIEditor()->GetPluginManager()->GetPluginByGUID("{4B9B7074-2D58-4AFD-BBE1-BE469D48456A}");
@@ -591,8 +592,6 @@ AmazonToolbar ToolbarManager::GetEditModeToolbar() const
    t.AddAction(ID_EDITMODE_ROTATE, ORIGINAL_TOOLBAR_VERSION);
    t.AddAction(ID_EDITMODE_SCALE, ORIGINAL_TOOLBAR_VERSION);

-    t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME);
-
    t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
    t.AddAction(ID_TOOLBAR_WIDGET_SNAP_GRID, ORIGINAL_TOOLBAR_VERSION);
    t.AddAction(ID_TOOLBAR_WIDGET_SNAP_ANGLE, ORIGINAL_TOOLBAR_VERSION);
@@ -622,6 +621,18 @@ AmazonToolbar ToolbarManager::GetObjectToolbar() const
    return t;
 }

+AmazonToolbar ToolbarManager::GetPlayConsoleToolbar() const
+{
+    AmazonToolbar t = AmazonToolbar("PlayConsole", QObject::tr("Play Console"));
+    t.SetMainToolbar(true);
+
+    t.AddAction(ID_TOOLBAR_WIDGET_SPACER_RIGHT, ORIGINAL_TOOLBAR_VERSION); 
+    t.AddAction(ID_TOOLBAR_SEPARATOR, ORIGINAL_TOOLBAR_VERSION);
+    t.AddAction(ID_TOOLBAR_WIDGET_PLAYCONSOLE_LABEL, ORIGINAL_TOOLBAR_VERSION);
+    t.AddAction(ID_VIEW_SWITCHTOGAME, TOOLBARS_WITH_PLAY_GAME);
+    return t;
+}
+
 AmazonToolbar ToolbarManager::GetEditorsToolbar() const
 {
    AmazonToolbar t = AmazonToolbar("Editors", QObject::tr("Editors Toolbar"));
@@ -753,7 +764,7 @@ void ToolbarManager::InstantiateToolbars()
    for (int i = 0; i < numToolbars; ++i)
    {
        InstantiateToolbar(i);
-        if (i == 1)
+        if (i == 2)
        {
            // Hack. Just copying how it was
            m_mainWindow->addToolBarBreak();
@@ -167,6 +167,7 @@ public:
    AmazonToolbar GetObjectToolbar() const;
    AmazonToolbar GetEditorsToolbar() const;
    AmazonToolbar GetMiscToolbar() const;
+    AmazonToolbar GetPlayConsoleToolbar() const;

 private:
    Q_DISABLE_COPY(ToolbarManager);
@@ -807,18 +807,11 @@ void CTrackViewDialog::UpdateActions()
        m_actions[ID_TRACKVIEW_MUTE_ALL]->setEnabled(true);
        m_actions[ID_ADDSCENETRACK]->setEnabled(true);

-        AzToolsFramework::EntityIdList entityIds;
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-            entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+        bool areAnyEntitiesSelected = false;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            areAnyEntitiesSelected, &AzToolsFramework::ToolsApplicationRequests::AreAnyEntitiesSelected);

-        if (entityIds.empty())
-        {
-            m_actions[ID_ADDNODE]->setEnabled(false);
-        }
-        else
-        {
-            m_actions[ID_ADDNODE]->setEnabled(true);
-        }
+        m_actions[ID_ADDNODE]->setEnabled(areAnyEntitiesSelected);
    }
    else
    {
@@ -1569,12 +1562,12 @@ void CTrackViewDialog::OnAddSelectedNode()
            sequence->MarkAsModified();
        }

-        AzToolsFramework::EntityIdList entityIds;
-        AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-            entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+        int selectedEntitiesCount = 0;
+        AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+            selectedEntitiesCount, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntitiesCount);

        // check to make sure all nodes were added and notify user if they weren't
-        if (addedNodes.GetCount() != entityIds.size())
+        if (addedNodes.GetCount() != selectedEntitiesCount)
        {
            IMovieSystem* movieSystem = GetIEditor()->GetMovieSystem();

@@ -1137,12 +1137,12 @@ void CTrackViewNodesCtrl::OnNMRclick(QPoint point)
                CTrackViewAnimNodeBundle addedNodes = groupNode->AddSelectedEntities(m_pTrackViewDialog->GetDefaultTracksForEntityNode());
                undoBatch.MarkEntityDirty(groupNode->GetSequence()->GetSequenceComponentEntityId());

-                AzToolsFramework::EntityIdList entityIds;
-                AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(
-                    entityIds, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
+                int selectedEntitiesCount = 0;
+                AzToolsFramework::ToolsApplicationRequestBus::BroadcastResult(
+                    selectedEntitiesCount, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntitiesCount);

                // check to make sure all nodes were added and notify user if they weren't
-                if (addedNodes.GetCount() != entityIds.size())
+                if (addedNodes.GetCount() != selectedEntitiesCount)
                {
                    IMovieSystem* movieSystem = GetIEditor()->GetMovieSystem();

@@ -21,6 +21,9 @@
 // AzQtComponents
 #include <AzQtComponents/DragAndDrop/ViewportDragAndDrop.h>

+#include <AzToolsFramework/API/ComponentEntitySelectionBus.h>
+#include <AzToolsFramework/ViewportSelection/EditorSelectionUtil.h>
+
 // Editor
 #include "ViewManager.h"
 #include "Include/ITransformManipulator.h"
@@ -1091,6 +1094,13 @@ void QtViewport::SetAxisConstrain(int axis)
    m_activeAxis = axis;
 };

+AzToolsFramework::ViewportInteraction::MouseInteraction QtViewport::BuildMouseInteraction(
+    [[maybe_unused]] Qt::MouseButtons buttons, [[maybe_unused]] Qt::KeyboardModifiers modifiers, [[maybe_unused]] const QPoint& point)
+{
+    // Implemented by sub-class
+    return AzToolsFramework::ViewportInteraction::MouseInteraction();
+}
+
 //////////////////////////////////////////////////////////////////////////
 bool QtViewport::HitTest(const QPoint& point, HitContext& hitInfo)
 {
@@ -1103,7 +1113,51 @@ bool QtViewport::HitTest(const QPoint& point, HitContext& hitInfo)
        hitInfo.bUseSelectionHelpers = true;
    }

-    return GetIEditor()->GetObjectManager()->HitTest(hitInfo);
+    const int viewportId = GetViewportId();
+
+    AzToolsFramework::EntityIdList visibleEntityIds;
+    AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequestBus::Event(
+        viewportId,
+        &AzToolsFramework::ViewportInteraction::MainEditorViewportInteractionRequests::FindVisibleEntities,
+        visibleEntityIds);
+
+    // Look through all visible entities to find the closest one to the specified mouse point
+    using namespace AzToolsFramework::ViewportInteraction;
+    AZ::EntityId entityIdUnderCursor;
+    float closestDistance = std::numeric_limits<float>::max();
+    MouseInteraction mouseInteraction = BuildMouseInteraction(QGuiApplication::mouseButtons(),
+        QGuiApplication::queryKeyboardModifiers(),
+        point);
+    for (auto entityId : visibleEntityIds)
+    {
+        using AzFramework::ViewportInfo;
+        // Check if components provide an aabb
+        if (const AZ::Aabb aabb = AzToolsFramework::CalculateEditorEntitySelectionBounds(entityId, ViewportInfo{ viewportId });
+            aabb.IsValid())
+        {
+            // Coarse grain check
+            if (AzToolsFramework::AabbIntersectMouseRay(mouseInteraction, aabb))
+            {
+                // If success, pick against specific component
+                if (AzToolsFramework::PickEntity(
+                    entityId, mouseInteraction,
+                    closestDistance, viewportId))
+                {
+                    entityIdUnderCursor = entityId;
+                }
+            }
+        }
+    }
+
+    // If we hit a valid Entity, then store the distance in the HitContext
+    // so that the caller can use this for calculations
+    if (entityIdUnderCursor.IsValid())
+    {
+        hitInfo.dist = closestDistance;
+        return true;
+    }
+
+    return false;
 }

 //////////////////////////////////////////////////////////////////////////
@@ -17,6 +17,7 @@
 #pragma once

 #if !defined(Q_MOC_RUN)
+#include <AzToolsFramework/Viewport/ViewportTypes.h>
 #include <AzToolsFramework/ViewportUi/ViewportUiManager.h>
 #include <Cry_Color.h>
 #include "IPostRenderer.h"
@@ -405,6 +406,12 @@ public:

    void SetAxisConstrain(int axis);

+    /// Take raw input and create a final mouse interaction.
+    /// @attention Do not map **point** from widget to viewport explicitly,
+    /// this is handled internally by BuildMouseInteraction - just pass directly.
+    virtual AzToolsFramework::ViewportInteraction::MouseInteraction BuildMouseInteraction(
+        Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, const QPoint& point);
+
    //////////////////////////////////////////////////////////////////////////
    // Selection.
    //////////////////////////////////////////////////////////////////////////
@@ -44,7 +44,4 @@ ConnectionUnitTest::~ConnectionUnitTest()

 }

-
-
-REGISTER_UNIT_TEST(ConnectionUnitTest)
-
+// REGISTER_UNIT_TEST(ConnectionUnitTest) // disabling due to intermittent test failure - LYN-3368
@@ -20,10 +20,8 @@ namespace LUAEditor
 {
    namespace Thumbnailer
    {
-        const int DEFAULT_THUMBNAIL_SIZE = 100;
-
        ThumbnailerNullComponent::ThumbnailerNullComponent() :
-            m_nullThumbnail(new AzToolsFramework::Thumbnailer::MissingThumbnail(DEFAULT_THUMBNAIL_SIZE))
+            m_nullThumbnail(new AzToolsFramework::Thumbnailer::MissingThumbnail())
        {
        }

@@ -53,7 +51,7 @@ namespace LUAEditor
            services.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
        }

-        void ThumbnailerNullComponent::RegisterContext(const char* /*contextName*/, int /*thumbnailSize*/)
+        void ThumbnailerNullComponent::RegisterContext(const char* /*contextName*/)
        {
        }

@@ -42,7 +42,7 @@ namespace LUAEditor
            //////////////////////////////////////////////////////////////////////////
            // ThumbnailerRequests
            //////////////////////////////////////////////////////////////////////////
-            void RegisterContext(const char* contextName, int thumbnailSize) override;
+            void RegisterContext(const char* contextName) override;
            void UnregisterContext(const char* contextName) override;
            bool HasContext(const char* contextName) const override;
            void RegisterThumbnailProvider(AzToolsFramework::Thumbnailer::SharedThumbnailProvider provider, const char* contextName) override;
@@ -22,13 +22,13 @@ namespace ImageProcessingAtom
 {
    namespace Thumbnails
    {
-        const int ImageThumbnailSize = 200;
+        static constexpr const int ImageThumbnailSize = 256;

        //////////////////////////////////////////////////////////////////////////
        // ImageThumbnail
        //////////////////////////////////////////////////////////////////////////
-        ImageThumbnail::ImageThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-            : Thumbnail(key, thumbnailSize)
+        ImageThumbnail::ImageThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key)
+            : Thumbnail(key)
        {
            auto sourceKey = azrtti_cast<const AzToolsFramework::AssetBrowser::SourceThumbnailKey*>(key.data());
            if (sourceKey)
@@ -66,7 +66,7 @@ namespace ImageProcessingAtom
            AzToolsFramework::Thumbnailer::ThumbnailerRendererRequestBus::QueueEvent(
                AZ::RPI::StreamingImageAsset::RTTI_Type(), &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail,
                m_key,
-                m_thumbnailSize);
+                ImageThumbnailSize);
            // wait for response from thumbnail renderer
            m_renderWait.acquire();
        }
@@ -34,7 +34,7 @@ namespace ImageProcessingAtom
        {
            Q_OBJECT
        public:
-            ImageThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+            ImageThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key);
            ~ImageThumbnail() override;

            //! AzToolsFramework::ThumbnailerRendererNotificationBus::Handler overrides...
@@ -110,30 +110,19 @@ namespace MaterialEditor
    {
        using namespace AzToolsFramework::AssetBrowser;

-        // Material Browser uses the following filters:
-        // 1. [All source files (no products) that contain products matching the assetType specified by searchWidget (default is materials and textures)]
-        // 2. [All folders (including empty folders)]
-        // 3. [All Sources and folders matching the search text typed in search widget]
-        // Final filter = ((1 OR 2) AND 3)
-
        QSharedPointer<EntryTypeFilter> sourceFilter(new EntryTypeFilter);
        sourceFilter->SetEntryType(AssetBrowserEntry::AssetEntryType::Source);

-        QSharedPointer<CompositeFilter> assetTypeFilter(new CompositeFilter(CompositeFilter::LogicOperatorType::AND));
-        assetTypeFilter->AddFilter(sourceFilter);
-        assetTypeFilter->AddFilter(m_ui->m_searchWidget->GetTypesFilter());
-
        QSharedPointer<EntryTypeFilter> folderFilter(new EntryTypeFilter);
        folderFilter->SetEntryType(AssetBrowserEntry::AssetEntryType::Folder);

        QSharedPointer<CompositeFilter> sourceOrFolderFilter(new CompositeFilter(CompositeFilter::LogicOperatorType::OR));
-        sourceOrFolderFilter->AddFilter(assetTypeFilter);
+        sourceOrFolderFilter->AddFilter(sourceFilter);
        sourceOrFolderFilter->AddFilter(folderFilter);

        QSharedPointer<CompositeFilter> finalFilter(new CompositeFilter(CompositeFilter::LogicOperatorType::AND));
        finalFilter->AddFilter(sourceOrFolderFilter);
-        finalFilter->AddFilter(m_ui->m_searchWidget->GetStringFilter());
-        finalFilter->SetFilterPropagation(AssetBrowserEntryFilter::PropagateDirection::Down);
+        finalFilter->AddFilter(m_ui->m_searchWidget->GetFilter());

        return finalFilter;
    }
@@ -21,13 +21,13 @@ namespace AZ
    {
        namespace Thumbnails
        {
-            const int MaterialThumbnailSize = 200;
+            static constexpr const int MaterialThumbnailSize = 512; // 512 is the default size in render to texture pass

            //////////////////////////////////////////////////////////////////////////
            // MaterialThumbnail
            //////////////////////////////////////////////////////////////////////////
-            MaterialThumbnail::MaterialThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-                : Thumbnail(key, thumbnailSize)
+            MaterialThumbnail::MaterialThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key)
+                : Thumbnail(key)
            {
                m_assetId = GetAssetId(key, RPI::MaterialAsset::RTTI_Type());
                if (!m_assetId.IsValid())
@@ -47,7 +47,7 @@ namespace AZ
                    RPI::MaterialAsset::RTTI_Type(),
                    &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail,
                    m_key,
-                    m_thumbnailSize);
+                    MaterialThumbnailSize);
                // wait for response from thumbnail renderer
                m_renderWait.acquire();
            }
@@ -36,7 +36,7 @@ namespace AZ
            {
                Q_OBJECT
            public:
-                MaterialThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+                MaterialThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key);
                ~MaterialThumbnail() override;

                //! AzToolsFramework::ThumbnailerRendererNotificationBus::Handler overrides...
@@ -22,13 +22,13 @@ namespace AZ
    {
        namespace Thumbnails
        {
-            const int MeshThumbnailSize = 200;
+            static constexpr const int MeshThumbnailSize = 512; // 512 is the default size in render to texture pass

            //////////////////////////////////////////////////////////////////////////
            // MeshThumbnail
            //////////////////////////////////////////////////////////////////////////
-            MeshThumbnail::MeshThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize)
-                : Thumbnail(key, thumbnailSize)
+            MeshThumbnail::MeshThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key)
+                : Thumbnail(key)
            {
                m_assetId = GetAssetId(key, RPI::ModelAsset::RTTI_Type());
                if (!m_assetId.IsValid())
@@ -48,7 +48,7 @@ namespace AZ
                    RPI::ModelAsset::RTTI_Type(),
                    &AzToolsFramework::Thumbnailer::ThumbnailerRendererRequests::RenderThumbnail,
                    m_key,
-                    m_thumbnailSize);
+                    MeshThumbnailSize);
                // wait for response from thumbnail renderer
                m_renderWait.acquire();
            }
@@ -35,7 +35,7 @@ namespace AZ
            {
                Q_OBJECT
            public:
-                MeshThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key, int thumbnailSize);
+                MeshThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey key);
                ~MeshThumbnail() override;

                //! AzToolsFramework::ThumbnailerRendererNotificationBus::Handler overrides...
@@ -82,8 +82,9 @@ namespace AZ
                return m_data;
            }

-            void CommonThumbnailRenderer::RenderThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, [[maybe_unused]] int thumbnailSize)
+            void CommonThumbnailRenderer::RenderThumbnail(AzToolsFramework::Thumbnailer::SharedThumbnailKey thumbnailKey, int thumbnailSize)
            {
+                m_data->m_thumbnailSize = thumbnailSize;
                m_data->m_thumbnailQueue.push(thumbnailKey);
                if (m_currentStep == Step::None)
                {
@@ -52,6 +52,7 @@ namespace AZ

                double m_simulateTime = 0.0f;
                float m_deltaTime = 0.0f;
+                int m_thumbnailSize = 512;

                //! Incoming thumbnail requests are appended to this queue and processed one at a time in OnTick function.
                AZStd::queue<AzToolsFramework::Thumbnailer::SharedThumbnailKey> m_thumbnailQueue;
@@ -74,6 +74,10 @@ namespace Multiplayer
        //! @param handler The SessionShutdownEvent handler to add
        virtual void AddSessionShutdownHandler(SessionShutdownEvent::Handler& handler) = 0;

+        //! Sends a packet telling if entity update messages can be sent
+        //! @param readyForEntityUpdates Ready for entity updates or not
+        virtual void SendReadyForEntityUpdates(bool readyForEntityUpdates) = 0;
+
        //! Returns the gem name associated with the provided component index.
        //! @param  netComponentId the componentId to return the gem name of
        //! @return the name of the gem that contains the requested component
@@ -73,6 +73,12 @@ namespace Multiplayer
        True
    };

+    enum class AutoActivate : uint8_t
+    {
+        DoNotActivate,
+        Activate
+    };
+
    // This is just a placeholder
    // The level/prefab cooking will devise the actual solution for identifying a dynamically spawnable entity within a prefab
    struct PrefabEntityId
@@ -14,6 +14,10 @@
        <Member Type="Multiplayer::HostId" Name="hostId" Init="Multiplayer::InvalidHostId" />
        <Member Type="Multiplayer::LongNetworkString" Name="map" />
    </Packet>
+  
+    <Packet Name="ReadyForEntityUpdates" Desc="Client confirming it is ready to receive entity updates">
+      <Member Type="bool" Name="readyForEntityUpdates" />
+    </Packet>

    <Packet Name="SyncConsole" Desc="Packet for synchornizing cvars between hosts">
        <Member Type="Multiplayer::LongNetworkString" Name="commandSet" Container="Vector" Count="32" />
@@ -33,10 +33,10 @@ namespace Multiplayer
        AzNetworking::IConnection* GetConnection() const override;
        EntityReplicationManager& GetReplicationManager() override;
        void Update(AZ::TimeMs serverGameTimeMs) override;
+        bool CanSendUpdates() const override;
+        void SetCanSendUpdates(bool canSendUpdates) override;
        //! @}

-        bool CanSendUpdates();
-
    private:
        EntityReplicationManager m_entityReplicationManager;
        AzNetworking::IConnection* m_connection = nullptr;
@@ -12,8 +12,13 @@

 namespace Multiplayer
 {
-    inline bool ClientToServerConnectionData::CanSendUpdates()
+    inline bool ClientToServerConnectionData::CanSendUpdates() const
    {
        return m_canSendUpdates;
    }
+
+    inline void ClientToServerConnectionData::SetCanSendUpdates(bool canSendUpdates)
+    {
+        m_canSendUpdates = canSendUpdates;
+    }
 }
@@ -44,5 +44,13 @@ namespace Multiplayer
        //! Creates and manages sending updates to the remote endpoint.
        //! @param serverGameTimeMs current server game time in milliseconds
        virtual void Update(AZ::TimeMs serverGameTimeMs) = 0;
+
+        //! Returns whether update messages can be sent to the connection.
+        //! @return true if update messages can be sent
+        virtual bool CanSendUpdates() const = 0;
+
+        //! Sets the state of connection whether update messages can be sent or not.
+        //! @param canSendUpdates the state value
+        virtual void SetCanSendUpdates(bool canSendUpdates) = 0;
    };
 }
@@ -34,10 +34,10 @@ namespace Multiplayer
        AzNetworking::IConnection* GetConnection() const override;
        EntityReplicationManager& GetReplicationManager() override;
        void Update(AZ::TimeMs serverGameTimeMs) override;
+        bool CanSendUpdates() const override;
+        void SetCanSendUpdates(bool canSendUpdates) override;
        //! @}

-        bool CanSendUpdates();
-
        NetworkEntityHandle GetPrimaryPlayerEntity();
        const NetworkEntityHandle& GetPrimaryPlayerEntity() const;

@@ -51,7 +51,7 @@ namespace Multiplayer
        EntityStopEvent::Handler m_controlledEntityRemovedHandler;
        EntityMigrationEvent::Handler m_controlledEntityMigrationHandler;
        AzNetworking::IConnection* m_connection = nullptr;
-        bool m_canSendUpdates = true;
+        bool m_canSendUpdates = false;
    };
 }

@@ -12,11 +12,17 @@

 namespace Multiplayer
 {
-    inline bool ServerToClientConnectionData::CanSendUpdates()
+    inline bool ServerToClientConnectionData::CanSendUpdates() const
    {
        return m_canSendUpdates;
    }

+    inline void ServerToClientConnectionData::SetCanSendUpdates(bool canSendUpdates)
+    {
+        m_canSendUpdates = canSendUpdates;
+    }
+
+
    inline NetworkEntityHandle ServerToClientConnectionData::GetPrimaryPlayerEntity()
    {
        return m_controlledEntity;
@@ -384,6 +384,19 @@ namespace Multiplayer
        return false;
    }

+    bool MultiplayerSystemComponent::HandleRequest( AzNetworking::IConnection* connection,
+        [[maybe_unused]] const AzNetworking::IPacketHeader& packetHeader, MultiplayerPackets::ReadyForEntityUpdates& packet)
+    {
+        IConnectionData* connectionData = reinterpret_cast<IConnectionData*>(connection->GetUserData());
+        if (connectionData)
+        {
+            connectionData->SetCanSendUpdates(packet.GetReadyForEntityUpdates());
+            return true;
+        }
+
+        return false;
+    }
+
    ConnectResult MultiplayerSystemComponent::ValidateConnect
    (
        [[maybe_unused]] const IpAddress& remoteAddress,
@@ -506,6 +519,15 @@ namespace Multiplayer
        handler.Connect(m_shutdownEvent);
    }

+    void MultiplayerSystemComponent::SendReadyForEntityUpdates(bool readyForEntityUpdates)
+    {
+        IConnectionSet& connectionSet = m_networkInterface->GetConnectionSet();
+        connectionSet.VisitConnections([readyForEntityUpdates](IConnection& connection)
+        {
+            connection.SendReliablePacket(MultiplayerPackets::ReadyForEntityUpdates(readyForEntityUpdates));
+        });
+    }
+
    const char* MultiplayerSystemComponent::GetComponentGemName(NetComponentId netComponentId) const
    {
        return GetMultiplayerComponentRegistry()->GetComponentGemName(netComponentId);
@@ -71,6 +71,7 @@ namespace Multiplayer
        bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, MultiplayerPackets::ClientMigration& packet);
        bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, MultiplayerPackets::NotifyClientMigration& packet);
        bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, MultiplayerPackets::EntityMigration& packet);
+        bool HandleRequest(AzNetworking::IConnection* connection, const AzNetworking::IPacketHeader& packetHeader, MultiplayerPackets::ReadyForEntityUpdates& packet);

        //! IConnectionListener interface
        //! @{
@@ -88,6 +89,7 @@ namespace Multiplayer
        void AddConnectionAcquiredHandler(ConnectionAcquiredEvent::Handler& handler) override;
        void AddSessionInitHandler(SessionInitEvent::Handler& handler) override;
        void AddSessionShutdownHandler(SessionShutdownEvent::Handler& handler) override;
+        void SendReadyForEntityUpdates(bool readyForEntityUpdates) override;
        const char* GetComponentGemName(NetComponentId netComponentId) const override;
        const char* GetComponentName(NetComponentId netComponentId) const override;
        const char* GetComponentPropertyName(NetComponentId netComponentId, PropertyIndex propertyIndex) const override;
@@ -73,6 +73,12 @@ namespace Multiplayer
        True
    };

+    enum class AutoActivate : uint8_t
+    {
+        DoNotActivate,
+        Activate
+    };
+
    // This is just a placeholder
    // The level/prefab cooking will devise the actual solution for identifying a dynamically spawnable entity within a prefab
    struct PrefabEntityId
@@ -543,11 +543,8 @@ namespace Multiplayer
        // Create an entity if we don't have one
        if (createEntity)
        {
-            // @pereslav
-            //replicatorEntity = GetNetworkEntityManager()->CreateSingleEntityImmediateInternal(prefabEntityId, EntitySpawnType::Replicate, AutoActivate::DoNotActivate, netEntityId, localNetworkRole, AZ::Transform::Identity());
            INetworkEntityManager::EntityList entityList = GetNetworkEntityManager()->CreateEntitiesImmediate(
-                prefabEntityId, netEntityId, localNetworkRole,
-                AZ::Transform::Identity());
+                prefabEntityId, netEntityId, localNetworkRole, AutoActivate::DoNotActivate, AZ::Transform::Identity());

            if (entityList.size() == 1)
            {
@@ -60,7 +60,8 @@ namespace Multiplayer
        //! Creates new entities of the given archetype
        //! @param prefabEntryId the name of the spawnable to spawn
        virtual EntityList CreateEntitiesImmediate(
-            const PrefabEntityId& prefabEntryId, NetEntityId netEntityId, NetEntityRole netEntityRole, const AZ::Transform& transform) = 0;
+            const PrefabEntityId& prefabEntryId, NetEntityId netEntityId, NetEntityRole netEntityRole, AutoActivate autoActivate,
+            const AZ::Transform& transform) = 0;

        //! Returns an ConstEntityPtr for the provided entityId.
        //! @param netEntityId the netEntityId to get an ConstEntityPtr for
@@ -11,19 +11,19 @@
 */

 #include <Source/NetworkEntity/NetworkEntityManager.h>
-#include <Source/Components/NetBindComponent.h>
-#include <Include/IMultiplayer.h>
-#include <AzCore/Interface/Interface.h>
+
+#include <AzCore/Asset/AssetManager.h>
 #include <AzCore/Console/IConsole.h>
 #include <AzCore/Console/ILogger.h>
+#include <AzCore/Interface/Interface.h>
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Slice/SliceMetadataInfoComponent.h>
+#include <AzFramework/Components/TransformComponent.h>
 #include <AzFramework/Entity/EntityContextBus.h>
 #include <AzFramework/Entity/GameEntityContextBus.h>
-#include <AzFramework/Components/TransformComponent.h>
 #include <Include/IMultiplayer.h>
 #include <Pipeline/NetworkSpawnableHolderComponent.h>
-#include <AzCore/Asset/AssetManager.h>
+#include <Source/Components/NetBindComponent.h>

 namespace Multiplayer
 {
@@ -361,7 +361,7 @@ namespace Multiplayer

    INetworkEntityManager::EntityList NetworkEntityManager::CreateEntitiesImmediate(
        const PrefabEntityId& prefabEntryId, NetEntityId netEntityId, NetEntityRole netEntityRole,
-        const AZ::Transform& transform)
+        AutoActivate autoActivate, const AZ::Transform& transform)
    {
        INetworkEntityManager::EntityList returnList;

@@ -407,6 +407,11 @@ namespace Multiplayer
                    transformComponent->SetWorldTM(transform);
                }

+                if (autoActivate == AutoActivate::DoNotActivate)
+                {
+                    clone->SetRuntimeActiveByDefault(false);
+                }
+
                AzFramework::GameEntityContextRequestBus::Broadcast(
                    &AzFramework::GameEntityContextRequestBus::Events::AddGameEntity, clone);

@@ -462,7 +467,9 @@ namespace Multiplayer

        m_rootSpawnableAsset = netSpawnableAsset;

-        const auto agentType = AZ::Interface<IMultiplayer>::Get()->GetAgentType();
+        auto* multiplayer = AZ::Interface<IMultiplayer>::Get();
+
+        const auto agentType = multiplayer->GetAgentType();
        const bool spawnImmediately =
            (agentType == MultiplayerAgentType::ClientServer || agentType == MultiplayerAgentType::DedicatedServer);

@@ -470,6 +477,12 @@ namespace Multiplayer
        {
            CreateEntitiesImmediate(*netSpawnable, NetEntityRole::Authority);
        }
+        else
+        {
+            // If we don't spawn net entities immediately (i.e. it is a client),
+            // tell the server/host it can start sending updates that will instantiate entities.
+            multiplayer->SendReadyForEntityUpdates(true);
+        }
    }

    void NetworkEntityManager::OnRootSpawnableReleased([[maybe_unused]] uint32_t generation)
@@ -50,7 +50,7 @@ namespace Multiplayer

        EntityList CreateEntitiesImmediate(
            const PrefabEntityId& prefabEntryId, NetEntityId netEntityId, NetEntityRole netEntityRole,
-            const AZ::Transform& transform) override;
+            AutoActivate autoActivate, const AZ::Transform& transform) override;

        uint32_t GetEntityCount() const override;
        NetworkEntityHandle AddEntityToEntityMap(NetEntityId netEntityId, AZ::Entity* entity) override;
@@ -0,0 +1,4 @@
+{
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "parentMaterial": "Materials/Presets/PBR/default_grid.material"
+}