Merge "Remove Webview Overlays on destroy" into sc-dev