Bug 929317 - [Message] Message waiting UI was flicked while start up
Bug 937514 - fix a wrong variable reference.
Merge pull request #14343 from steveck-chung/bug-929317

Bug 929317 - [Message] Message waiting UI was flicked while start up. r=julienw
Merge pull request #14349 from evelynhung/issue-937514

Bug 937514 - fix a wrong variable reference.