am 15740edd: am b70da2bb: Merge change I1c281504 into eclair-mr2

Merge commit '15740edd2ac0026e97699028d07e6b0e773d3643'

* commit '15740edd2ac0026e97699028d07e6b0e773d3643':
  Remove some unused window manager methods.