Bug 959694 - Combine Rocketbar and statusbar

also contains a patch for Bug 978937 - Do a better job of disabling Rocketbar (which needs to land at the same time to prevent bug 991698 regressing again).