Merge "Revisions to ResolverActivity" into jb-dev