Merge "Avoid clearing default browser setting when unnecessary"