Fix scenario where push was not sent

If you had two devices with same push token for a different push provider one of them used to not receive push.

See !805 (merged)