Merge "Add a sys prop to control WebView Overlays support" into sc-dev