Merge change 25423 into eclair

* changes:
  fix [2119400] sholes: artifacting when switching orientation