TS-343 - Phase 2 - GCM/APNS callbacks - Investigation-related changes