Bug 973694 - Fix glitchy-looking private browsing indicator on OS X when tabs in titlebar are disabled. r=MattN

This also has the benefit of fixing bug 989604.