Make data not to be nil when collapse_key is nil
Merge branch 'fix-send_notification'