Merge "Use user id from PromptInfo instead of context for logo badge" into main