Merge "Reparent surface control for Webview overlay" into sc-dev