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