Merge change I5469a4ac into eclair

* changes:
  fixed [2260070] display stopped updating