am e5504ba1: Merge "Visual glitches when starting extracted text" into ics-mr1

* commit 'e5504ba1a279fc58eac74bda8d9c5c29cae235a9':
  Visual glitches when starting extracted text