Merge "Revert "Flag-flip: set chromium to be the default WebView""