Merge "Removed "forUser" variants in NotificationManager"