Merge "Clear default-browser state when it's uninstalled" into oc-dev