Merge "Use correct user context to get the EnhancedConfirmationManager" into main