@erikvold I'm sorry to go back & forth on this but I think @ehsan is right, specially if we consider effect this will have on old add-ons. Our main goal was to prevent add-on's from breaking, but excluding private windows for add-on's that have not opted in already does that. Combining both will actually lead to misbehavior. I commented in more details above.