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