Use service for resolution
Prepare for 1.1.0

Move picker to ResolveActivity.