[CLOUDSRV-1532] Multiple push notifications should better handled