Merge "Better screen size adaptation for ResolverActivity" into jb-dev