Merge "DO NOT MERGE. ActivityPicker shouldn't grant permissions." into oc-dev