Factor choose group avatar button
Merge pull request #8111 from cirosantilli/dry-group-avatar-button

Factor choose group avatar button