Backout bug 828349, bug 835022 for robocop orange and exception from Tabs.getDisplayCount.
Merge backout on a CLOSED TREE.