Merge "Harmonize notification configuration"