Merge "Restore foreground service notifications"