Merge "Webview overlay support" into sc-dev