Merge "Suppress the initial notification when the app is foreground"