Merge "Validate notification canceled intent before processing" into main