Merge change I1c0bebbc into eclair

* changes:
  fix [2262591] Junk on screen in ERD46