Merge "Fix a Dead Loop issue in RecipientEditTextView"