Merge change Ib5736616 into eclair

* changes:
  Fix issue #2191572: Difficulties drawing window shade