Merge branch 'mjog/766-search-deadlock' into 'gnome-3-36'
ConversationWebView: Avoid a deadlock cancelling search highlighting
Closes #766 (closed)
See merge request !486 (merged)
(cherry picked from commit 99730af3)
ee2c66a3 ConversationWebView: Avoid a deadlock cancelling search highlighting