Few adjustement

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/LightingDebug.cs

     {
         public bool IsDebugDisplayEnabled()
         {
-            return debugLightingMode != DebugLightingMode.None;
+            return debugLightingMode != DebugLightingMode.None || overrideSmoothness || overrideAlbedo || overrideNormal;
         }
 
         public DebugLightingMode    debugLightingMode = DebugLightingMode.None;

ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/LightingDebugPanel.cs

                 DebugItem shadowMaxValue = m_DebugPanel.GetDebugItem(DebugDisplaySettings.kShadowMaxValueDebug);
                 shadowMaxValue.handler.OnEditorGUI();
 
+                DebugItem lightingDebugModeItem = m_DebugPanel.GetDebugItem(DebugDisplaySettings.kLightingDebugMode);
+                lightingDebugModeItem.handler.OnEditorGUI();
+                switch ((DebugLightingMode)lightingDebugModeItem.GetValue())
+                {
+                    case DebugLightingMode.EnvironmentProxyVolume:
+                        {
+                            ++EditorGUI.indentLevel;
+                            m_DebugPanel.GetDebugItem(DebugDisplaySettings.kDebugEnvironmentProxyDepthScale).handler.OnEditorGUI();
+                            --EditorGUI.indentLevel;
+                            break;
+                        }
+                }
+
                 DebugItem overrideSmoothnessItem = m_DebugPanel.GetDebugItem(DebugDisplaySettings.kOverrideSmoothnessDebug);
                 overrideSmoothnessItem.handler.OnEditorGUI();
                 if ((bool)overrideSmoothnessItem.GetValue())
 
                 DebugItem overrideNormalItem = m_DebugPanel.GetDebugItem(DebugDisplaySettings.kOverrideNormalDebug);
                 overrideNormalItem.handler.OnEditorGUI();
-
-                DebugItem lightingDebugModeItem = m_DebugPanel.GetDebugItem(DebugDisplaySettings.kLightingDebugMode);
-                lightingDebugModeItem.handler.OnEditorGUI();
-                switch ((DebugLightingMode)lightingDebugModeItem.GetValue())
-                {
-                    case DebugLightingMode.DiffuseLighting:
-                        {
-                            overrideAlbedoItem.SetValue(true); // Force to be true for diffuse lighting mode
-                            break;
-                        }
-                    case DebugLightingMode.EnvironmentProxyVolume:
-                        {
-                            ++EditorGUI.indentLevel;
-                            m_DebugPanel.GetDebugItem(DebugDisplaySettings.kDebugEnvironmentProxyDepthScale).handler.OnEditorGUI();
-                            --EditorGUI.indentLevel;
-                            break;
-                        }
-                }
 
                 var fullScreenDebugModeHandler = m_DebugPanel.GetDebugItem(DebugDisplaySettings.kFullScreenDebugMode);
                 fullScreenDebugModeHandler.handler.OnEditorGUI();