am af3e233f: am fc36afcb: am f998c4a2: Merge change I1c0bebbc into eclair

Merge commit 'af3e233fe3222990440433d5f90a6a310d0170e3'

* commit 'af3e233fe3222990440433d5f90a6a310d0170e3':
  fix [2262591] Junk on screen in ERD46