#974: Fix issue with wrong payload for GCM / APNS / template