Bug 929317 - [Message] Message waiting UI was flicked while start up
Merge pull request #14430 from steveck-chung/v1.2-uplift

Bug 929317 - [Message] Message waiting UI was flicked while start up. r=julienw, a=koi+