Bug 914942: uplift to the leo branch

https://bugzilla.mozilla.org/show_bug.cgi?id=914942