Merge "Flag removal: RELEASE_AVATAR_PICKER_APP" into main