Merge "Update supervisionIntentProvider to use role holder package" into main