Merge "Add bugfix flag propagate_user_context_for_intent_creation" into main