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

* commit 'dad52e1500660c72a4defd1c4d1139cb1f90ac7b':
  Better screen size adaptation for ResolverActivity