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

* commit '2e97db4981e7773e84deee37c394748076b1aafd':
  Visual glitches when starting extracted text