Merge "Move current WebView provider from Settings.Secure to Settings.Global" into nyc-dev