I checked the work done in there and Imo this is far from usable. Let's get the windowId right in 2.2 an backport it later.
It doesn't make any sense to have 2 branches to do try & error in this area. To stress your butterfly analogy: there is a difference between a cocoon and a hydra ;) LieGrue, strub
