am 1aa865aa: am 2bb13573: Bug fix: 3405930 Crash editing overlay text

* commit '1aa865aae054de0f5f2cb6ee58a6b93ad4d0f673':
  Bug fix: 3405930 Crash editing overlay text