Merge pull request #17897 from arcturus/bug-990496

Bug 990496 - [Contacts] Error when user tries to cancel importing contacts