bug 857910 - [Dialer] determine whether oncall screen is locked-style right on load
Merge pull request #9221 from rexboy7/fix-bug857910

bug 857910 - [Dialer] determine whether oncall screen is locked-style ri...
Bug 862758 - Add mozAlarms support to the desktop-helper. r=kgrandon
Merge pull request #9239 from KevinGrandon/vingtetun-desktop-helper.mozalarms

Bug 862758 - Add mozAlarms support to the desktop-helper. r=kgrandon