Merge pull request #9956 from alivedise/bugzilla/875262

Bug 875262 - Default channel on lockscreen is notification r=davidflanagan(cherry picked from commit 5bfd97ef33c3526c9f26a15ab8f51d933d03baf6)