diff --git a/accelerator-home-ui/settings.json b/accelerator-home-ui/settings.json
index 751f090..44f087c 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.7"
+    "version": "5.0.9"
   }
 }
diff --git a/accelerator-home-ui/src/App.js b/accelerator-home-ui/src/App.js
index c0e24a7..e46b78c 100644
--- a/accelerator-home-ui/src/App.js
+++ b/accelerator-home-ui/src/App.js
@@ -1046,6 +1046,13 @@ export default class App extends Router.App {
 				}).then(res => {
 					this.WARN(JSON.stringify(res))
 				})
+				RDKShellApis.removeKeyIntercept({
+					"keyCode": 115,
+					"modifiers": [],
+					"client": data.callsign
+				}).then(res => {
+					this.WARN(JSON.stringify(res))
+				})
 			}
 			if (data.success) {
 				if ((GLOBALS.topmostApp === data.client) &&
@@ -1070,6 +1077,9 @@ export default class App extends Router.App {
 						}, {
 							"keyCode": 175,
 							"modifiers": []
+						}, {
+							"keyCode": 115,
+							"modifiers": []
 						}],
 						"client": data.callsign
 					}]
@@ -1103,6 +1113,13 @@ export default class App extends Router.App {
 				}).then(res => {
 					this.WARN(JSON.stringify(res))
 				})
+				RDKShellApis.removeKeyIntercept({
+					"keyCode": 115,
+					"modifiers": [],
+					"client": data.callsign
+				}).then(res => {
+					this.WARN(JSON.stringify(res))
+				})
 			}
 			if ((GLOBALS.topmostApp === data.client) &&
 				(GLOBALS.selfClientName === "ResidentApp" || GLOBALS.selfClientName === "FireboltMainApp-refui") && GLOBALS.Miracastclientdevicedetails.state != "PLAYING") {
@@ -1130,6 +1147,9 @@ export default class App extends Router.App {
 							}, {
 								"keyCode": 175,
 								"modifiers": []
+							}, {
+								"keyCode": 115,
+								"modifiers": []
 							}],
 							"client": data.client
 						}]
@@ -1175,6 +1195,13 @@ export default class App extends Router.App {
 					}).then(res => {
 						this.WARN(JSON.stringify(res))
 					})
+					RDKShellApis.removeKeyIntercept({
+					"keyCode": 115,
+					"modifiers": [],
+					"client": data.callsign
+					}).then(res => {
+						this.WARN(JSON.stringify(res))
+					})
 				}
 				if ((GLOBALS.topmostApp === data.client) &&
 					(GLOBALS.selfClientName === "ResidentApp") && GLOBALS.Miracastclientdevicedetails.state != "PLAYING") {
@@ -1209,6 +1236,13 @@ export default class App extends Router.App {
 				}).then(res => {
 					this.WARN(JSON.stringify(res))
 				})
+				RDKShellApis.removeKeyIntercept({
+					"keyCode": 115,
+					"modifiers": [],
+					"client": data.callsign
+				}).then(res => {
+					this.WARN(JSON.stringify(res))
+				})
 			}
 			if ((GLOBALS.topmostApp === data.client) &&
 				(GLOBALS.selfClientName === "ResidentApp" || GLOBALS.selfClientName === "FireboltMainApp-refui") && GLOBALS.Miracastclientdevicedetails.state != "PLAYING") {
@@ -1244,6 +1278,13 @@ export default class App extends Router.App {
 				}).then(res => {
 					this.WARN(JSON.stringify(res))
 				})
+				RDKShellApis.removeKeyIntercept({
+					"keyCode": 115,
+					"modifiers": [],
+					"client": data.callsign
+				}).then(res => {
+					this.WARN(JSON.stringify(res))
+				})
 			}
 			if ((GLOBALS.topmostApp === data.client) &&
 				(GLOBALS.selfClientName === "ResidentApp" || GLOBALS.selfClientName === "FireboltMainApp-refui") && GLOBALS.Miracastclientdevicedetails.state != "PLAYING") {
diff --git a/accelerator-home-ui/src/api/XcastApi.js b/accelerator-home-ui/src/api/XcastApi.js
index 3191211..49e0602 100644
--- a/accelerator-home-ui/src/api/XcastApi.js
+++ b/accelerator-home-ui/src/api/XcastApi.js
@@ -209,8 +209,10 @@ export default class XcastApi {
   }
 
 	setApplicationState(params) {
+    params.error = 'none';
 		return new Promise((resolve) => {
 			this._thunder.call(this.callsign, 'setApplicationState', params).then(result => {
+        this.LOG("XcastAPI setApplicationState Updating: " + JSON.stringify(params) + " result: " + JSON.stringify(result))
 				resolve(true);
 			}).catch(err => {
 				this.ERR("setApplicationState failed trying older API. error is: " + JSON.stringify(err));