removing token type
Merge remote-tracking branch 'origin/v2-photopickerplus' into v2-photopickerplus