Merge "Add user selectable Default Browser feature"