am 218d4e8a: Merge "Make sure that we get the expected notifications to update the conversation list." into jb-ub-mail

* commit '218d4e8a958510c26a4fa998eb09cafeb172879c':
  Make sure that we get the expected notifications to update the conversation list.