Merge "Add AvatarPicker to GSI" into main