Merge "Turn on Webview Overlays" into sc-dev