Merge "Don't CTS mandate ACTION_WEBVIEW_SETTINGS" into rvc-dev