Merge "Allow users to set the default browser via ResolverActivity"