Merge "Add intent-filter for ACTION_PICK_IMAGES"