Merge "Revert^2 "Visit URIs in intents associated with notifications."" into main