am 8b7e1e57: Cherry-pick Fix a Dead Loop issue in RecipientEditTextView

* commit '8b7e1e5760f236a505ce2e91563e8ac5d75af7cc':
  Cherry-pick Fix a Dead Loop issue in RecipientEditTextView