Merge "Fix NullPointerException in RecipientsEditor."