Bug 1040342 - Follow up to bug 1039199 with tests
Bug 1036642 - Enable access to the rocketbar while on a call.
Merge pull request #21877 from etiennesegonzac/bug-1036642

Bug 1036642 - Enable access to the rocketbar while on a call. r=21
Merge pull request #21893 from etiennesegonzac/bug-1040342

Bug 1040342 - Follow up to bug 1039199 with tests r=Rik