Merge "Intercept intents before applying GWPC policy." into main