Merge "Separate adapter logic from ChooserActivity and ResolverActivity"