Merge "Make ResolverActivity respect selector intent when making filters" into nyc-dev