am edca3dd4: am d00c91b9: am 06208d07: cherrypick: Reset maxlines when the user expands text

* commit 'edca3dd4e70022782d2b89ff3c631392a868ce9d':
  cherrypick: Reset maxlines when the user expands text