Bug 942704 - [Status bar] Followup of bug 936201, considering activity.
Merge pull request #14156 from gasolin/issue-942704

Bug 942704 - [Status bar] Followup of bug 936201, considering activity, r=alive