removing unintended tab changes and default values added during rebase

Author: satyanaag-silabs

examples/closure-app/silabs/build_for_wifi_args.gni

@@ -19,5 +19,4 @@ import("${chip_root}/src/platform/silabs/wifi/args.gni")
 
 sl_enable_test_event_trigger = false
 chip_enable_ota_requestor = false
-disable_lcd = false
 app_data_model = "${chip_root}/examples/closure-app/closure-common"

src/app/zap_cluster_list.json

@@ -118,9 +118,6 @@
         "THERMOSTAT_CLUSTER": [
             "thermostat-client"
         ],
-        "THERMOSTAT_CLUSTER": [
-            "thermostat-client"
-        ],
         "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [],
         "THREAD_BORDER_ROUTER_MANAGEMENT_CLUSTER": [],
         "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [],
@@ -203,7 +200,7 @@
             "chime-server"
         ],
         "CLOSURE_CONTROL_CLUSTER": [
-            "closure-control-server"
+            "color-control-server"
         ],
         "COLOR_CONTROL_CLUSTER": [
             "color-control-server"