Merge "Fix "Set as Default" error in ResolverActivity"