Merge "Resolve based on the correct user's default browser" into mnc-dev