Fixed issue with null context after register for push token callback
Merge branch 'fix/null-context' into develop

* fix/null-context:
  Fixed issue with null context after register for push token callback