Merge "Fix default browser is reset after restoring"