Merge "Fix some oddities in ResolverActivity" into jb-dev