Merge change I1c281504 into eclair-mr2

* changes:
  Remove some unused window manager methods.