Merge "Add feature flag for Enhanced Confirmation Mode" into main