Merge "Fix "always" option in ResolverActivity" into tm-dev