Merge change I56c3504f into eclair

* changes:
  fix [2211532] improves sholes graphics performance