Merge "Add user selectable Default Browser feature - part 2" into mnc-dev