Merge "Fix the badge in badge (triple badging), by simply removing the user badge (FLAG_SKIP_USER_BADGE)." into main