Merge "Create a new trunk stable flag for intent redirect" into main