Merge changes Ia7d9514e,I3e9e4f47 into rvc-dev

* changes:
  Yearly Window Manager spring cleaning #2
  Yearly Window Manager spring cleaning #1