Backed out changesets 45840c6628d7 and acadb164dbc5 (bug 941805) for causing bug 966782.
Merge latest green inbound changeset and mozilla-central
Bug 962212 (followup) - Fix a typo in metro Tab constructor that broke inheritance of private flag [r=azasypkin]
Merge fx-team to m-c on a CLOSED TREE.