diff --git a/accelerator-home-ui/settings.json b/accelerator-home-ui/settings.json
index 0b6223a..b73ffb3 100644
--- a/accelerator-home-ui/settings.json
+++ b/accelerator-home-ui/settings.json
@@ -13,6 +13,6 @@
     "log": true,
     "enableAppSuspended": true,
     "showVersion": false,
-    "version": "5.0.20"
+    "version": "5.0.24"
   }
 }
diff --git a/accelerator-home-ui/src/App.js b/accelerator-home-ui/src/App.js
index 31f8ac6..e9fb667 100644
--- a/accelerator-home-ui/src/App.js
+++ b/accelerator-home-ui/src/App.js
@@ -700,11 +700,11 @@ export default class App extends Router.App {
 				this.SubscribeToHdmiCecSourcevent(result[0].state, self.appIdentifiers)
 				let getfriendlyname, getosdname;
 				setTimeout(() => {
-					xcastApi.getFriendlyName().then(res => {
-						getfriendlyname = res.friendlyname;
-						this.LOG("XcastApi getFriendlyName :" + JSON.stringify(getfriendlyname));
+					appApi.getFriendlyName().then(res => {
+						getfriendlyname = res.friendlyName;
+						this.LOG("AppApi getFriendlyName :" + JSON.stringify(getfriendlyname));
 					}).catch(err => {
-						this.ERR("XcastApi getFriendlyName Error: " + JSON.stringify(err));
+						this.ERR("AppApi getFriendlyName Error: " + JSON.stringify(err));
 					})
 					cecApi.getOSDName().then(result => {
 						getosdname = result.name;
@@ -724,11 +724,11 @@ export default class App extends Router.App {
 				cecApi.activate().then(() => {
 					let getfriendlyname, getosdname;
 					setTimeout(() => {
-						xcastApi.getFriendlyName().then(res => {
-							getfriendlyname = res.friendlyname;
-							this.LOG("XcastApi getFriendlyName :" + JSON.stringify(getfriendlyname));
+						appApi.getFriendlyName().then(res => {
+							getfriendlyname = res.friendlyName;
+							this.LOG("AppApi getFriendlyName :" + JSON.stringify(getfriendlyname));
 						}).catch(err => {
-							this.ERR("XcastApi getFriendlyName Error: " + JSON.stringify(err));
+							this.ERR("AppApi getFriendlyName Error: " + JSON.stringify(err));
 						})
 						cecApi.getOSDName().then(result => {
 							getosdname = result.name;
@@ -756,18 +756,18 @@ export default class App extends Router.App {
 			console.warn("Xcast plugin activate");
 			if (result) {
 				this.registerXcastListeners();
-				// Update Xcast friendly name
 				let serialnumber = "DefaultSLNO";
 				let modelName = "RDK" + GLOBALS.deviceType;
-				await appApi.getSerialNumber().then(async res => {
-					// Reduce display length; trim to last 6 characters
-					serialnumber = (res.length < 6) ? res : res.slice(-6);
-				});
-				await this.xcastApi.getModelName().then(model => {
-					modelName = model + serialnumber;
-				});
+				const serialRes = await appApi.getSerialNumber();
+				serialnumber = (serialRes.length < 6) ? serialRes : serialRes.slice(-6);
+				const model = await this.xcastApi.getModelName();
+				modelName = (model || modelName) + serialnumber;
 				this.LOG("Xcast friendly name to be set: " + JSON.stringify(modelName));
-				await this.xcastApi.setFriendlyName(modelName);
+				try {
+					await appApi.setFriendlyName(modelName);
+				} catch (err) {
+					this.ERR("AppApi setFriendlyName error: " + JSON.stringify(err) + " - continuing Xcast activation");
+				}
 				await this.xcastApi.setEnabled(true).then(res => {
 					GLOBALS.LocalDeviceDiscoveryStatus = true;
 					console.warn("Xcast setEnabled success" + JSON.stringify(res));
diff --git a/accelerator-home-ui/src/api/AppApi.js b/accelerator-home-ui/src/api/AppApi.js
index 7ed87fb..e20157b 100644
--- a/accelerator-home-ui/src/api/AppApi.js
+++ b/accelerator-home-ui/src/api/AppApi.js
@@ -1529,11 +1529,52 @@ export default class AppApi {
     })
   }
 
+  getFriendlyName() {
+    return new Promise((resolve, reject) => {
+      thunder.call('org.rdk.System', 'getFriendlyName').then(result => {
+        if (result.success) {
+          resolve(result)
+        } else {
+          const error = new Error('getFriendlyName failed: success=false');
+          error.result = result;
+          reject(error)
+        }
+      }).catch(err => {
+        this.ERR("AppAPI getFriendlyName error:", JSON.stringify(err, 3, null))
+        Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system getFriendlyName " + JSON.stringify(err), false, null)
+        reject(err)
+      })
+    })
+  }
+
+  setFriendlyName(name) {
+    return new Promise((resolve, reject) => {
+      thunder.call('org.rdk.System', 'setFriendlyName', { "friendlyName": name }).then(result => {
+        if (result.success) {
+          resolve(result)
+        } else {
+          const error = new Error('setFriendlyName failed: success=false');
+          error.result = result;
+          reject(error)
+        }
+      }).catch(err => {
+        this.ERR("AppAPI setFriendlyName error:", JSON.stringify(err, 3, null))
+        Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system setFriendlyName " + JSON.stringify(err), false, null)
+        reject(err)
+      })
+    })
+  }
+  
   getRFCConfig(rfcParamsList) {
     return new Promise((resolve, reject) => {
       thunder.call('org.rdk.System', 'getRFCConfig', rfcParamsList).then(result => {
-        if (result.success) resolve(result)
-        reject(false)
+        if (result.success) {
+          resolve(result)
+        } else {
+          const error = new Error('getRFCConfig failed: success=false');
+          error.result = result;
+          reject(error)
+        }
       }).catch(err => {
         this.ERR("AppAPI getRFCConfig error:", JSON.stringify(err, 3, null))
         Metrics.error(Metrics.ErrorType.OTHER, "PluginError", "Error in Thunder system getRFCConfig " + JSON.stringify(err), false, null)
diff --git a/accelerator-home-ui/src/overlays/OtherSettings/PrivacyScreenOverlay.js b/accelerator-home-ui/src/overlays/OtherSettings/PrivacyScreenOverlay.js
index 61912ac..dc65efd 100644
--- a/accelerator-home-ui/src/overlays/OtherSettings/PrivacyScreenOverlay.js
+++ b/accelerator-home-ui/src/overlays/OtherSettings/PrivacyScreenOverlay.js
@@ -71,6 +71,7 @@ export default class PrivacyScreen extends Lightning.Component {
                     },
                 },
                 UsbMediaDevices: {
+                    alpha:0.3,
                     y: 90,
                     type: SettingsMainItem,
                     Title: {
@@ -187,7 +188,7 @@ export default class PrivacyScreen extends Lightning.Component {
     _focus() {
         this._setState(this.state)
         this.checkLocalDeviceStatus()
-        this.checkUSBDeviceStatus()
+        // this.checkUSBDeviceStatus()
     }
 
     checkUSBDeviceStatus() {
@@ -217,14 +218,14 @@ export default class PrivacyScreen extends Lightning.Component {
     toggleLocalDeviceDiscovery() {
         xcastApi.getEnabled().then(res => {
             if (!res.enabled) {
-                xcastApi.activate().then(res => {
+                xcastApi.setEnabled(true).then(res => {
                     if (res) {
                         this.tag('LocalDeviceDiscovery.Button').src = Utils.asset('images/settings/ToggleOnOrange.png')
                     }
                 })
             }
             else {
-                xcastApi.deactivate().then(res => {
+                xcastApi.setEnabled(false).then(res => {
                     if (res) {
                         this.tag('LocalDeviceDiscovery.Button').src = Utils.asset('images/settings/ToggleOffWhite.png')
                     }
@@ -258,7 +259,7 @@ export default class PrivacyScreen extends Lightning.Component {
                     //  this._setState('PrivacyPolicy')
                 }
                 _handleDown() {
-                    this._setState('UsbMediaDevices')
+                    this._setState('AudioInput')
                 }
                 _handleEnter() {
                     this.toggleLocalDeviceDiscovery()
@@ -307,7 +308,7 @@ export default class PrivacyScreen extends Lightning.Component {
                     this.tag('AudioInput')._unfocus()
                 }
                 _handleUp() {
-                    this._setState('UsbMediaDevices')
+                    this._setState('LocalDeviceDiscovery')
                 }
                 _handleDown() {
                     this._setState('ClearCookies')
diff --git a/accelerator-home-ui/src/screens/OtherSettingsScreens/PrivacyScreen.js b/accelerator-home-ui/src/screens/OtherSettingsScreens/PrivacyScreen.js
index c37ace2..4742ec1 100644
--- a/accelerator-home-ui/src/screens/OtherSettingsScreens/PrivacyScreen.js
+++ b/accelerator-home-ui/src/screens/OtherSettingsScreens/PrivacyScreen.js
@@ -84,6 +84,7 @@ export default class PrivacyScreen extends Lightning.Component {
                     },
                 },
                 UsbMediaDevices: {
+                    alpha:0.3,
                     y: 90,
                     type: SettingsMainItem,
                     Title: {
@@ -196,7 +197,7 @@ export default class PrivacyScreen extends Lightning.Component {
     _focus() {
         this._setState(this.state)
         this.checkLocalDeviceStatus()
-        this.checkUSBDeviceStatus()
+        // this.checkUSBDeviceStatus()
     }
 
     _handleBack() {
@@ -232,7 +233,7 @@ export default class PrivacyScreen extends Lightning.Component {
         if (GLOBALS.LocalDeviceDiscoveryStatus) {
              xcastApi.getEnabled().then(res => {
                 if (res.enabled) {
-                     xcastApi.deactivate().then(res => {
+                     xcastApi.setEnabled(false).then(res => {
                         this.tag('LocalDeviceDiscovery.Button').src = Utils.asset('images/settings/ToggleOffWhite.png')
                         GLOBALS.LocalDeviceDiscoveryStatus = false;
                     })
@@ -242,7 +243,7 @@ export default class PrivacyScreen extends Lightning.Component {
                 this.tag('LocalDeviceDiscovery.Button').src = Utils.asset('images/settings/ToggleOffWhite.png')
             })
         } else {
-            xcastApi.activate().then(res => {
+            xcastApi.setEnabled(true).then(res => {
                 if (res) {
                     GLOBALS.LocalDeviceDiscoveryStatus = true;
                     this.tag('LocalDeviceDiscovery.Button').src = Utils.asset('images/settings/ToggleOnOrange.png')
@@ -267,7 +268,7 @@ export default class PrivacyScreen extends Lightning.Component {
                     // this._setState('PrivacyPolicy')
                 }
                 _handleDown() {
-                    this._setState('UsbMediaDevices')
+                    this._setState('AudioInput')
                 }
                 _handleEnter() {
                     this.toggleLocalDeviceDiscovery()
@@ -316,7 +317,7 @@ export default class PrivacyScreen extends Lightning.Component {
                     this.tag('AudioInput')._unfocus()
                 }
                 _handleUp() {
-                    this._setState('UsbMediaDevices')
+                    this._setState('LocalDeviceDiscovery')
                 }
                 _handleDown() {
                     this._setState('ClearCookies')
diff --git a/accelerator-home-ui/src/screens/SplashScreens/NetworkList.js b/accelerator-home-ui/src/screens/SplashScreens/NetworkList.js
index fd82db6..72aedb3 100644
--- a/accelerator-home-ui/src/screens/SplashScreens/NetworkList.js
+++ b/accelerator-home-ui/src/screens/SplashScreens/NetworkList.js
@@ -252,6 +252,7 @@ export default class NetworkList extends Lightning.Component {
         seenSSIDs.add(uniqueKey)
         return device
       })
+      this.tag('Networks.AvailableNetworks').tag("List").rollMax=this._otherList.length * 90
       this.tag('Networks.AvailableNetworks').h = this._otherList.length * 90
       this.tag('Networks.AvailableNetworks').tag('List').h = this._otherList.length * 90
       this.tag('Networks.AvailableNetworks').tag('List').items = this._otherList.map((item, index) => {