Merge "Add a flag and toast for Intent Redirect" into main