[geary] (28 commits) Non-fast-forward update to branch wip/infinte-filling-redux

[Michael Gratton <mjog src gnome org>]

The branch 'wip/infinte-filling-redux' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  bd81e79... Make App.ReseedOperation alway check the window for re-fill

Commits added to the branch:

  2f36221... Fix conflicting keyboard shortcuts and update overlay (*)
  5ad0355... Merge branch 'wip/shortcut-conflicts' into 'mainline' (*)
  7cf9825... Make ImapDb.SearchQuery prepare terms at construction time (*)
  983e8ce... Mark Geary.Account.open_search as async and throwing an err (*)
  f9ba7a0... Remove unused code (*)
  b4a04f8... Use a single RO transaction when removing matches from a se (*)
  abdcfc8... Execute ConversationMonitor ops in batches to avoid UI stal (*)
  e56908a... Append unknown conversations since it may be re-constituted (*)
  4d18b7b... Only insert email into the conversation monitor when needed (*)
  3786725... Bump ConversationMonitor op batch size right up (*)
  d9c2a96... Use a list when producing search results to preserve orderi (*)
  389f31d... Fix search including results from spam, trash and drafts (*)
  724450c... Minor source code formatting improvements (*)
  1bab91e... Update Polish translation (*)
  e65d45f... Merge branch 'wip/search-fixes' into 'mainline' (*)
  b3a44d1... Update Finnish translation (*)
  89682e6... Update Catalan translation (*)
  c0e13ce... Update Romanian translation (*)
  ba64c42... Update Italian translation (*)
  318790a... Update Spanish translation (*)
  93acc93... Make unread/read shortcut help text same for Ctrl & single  (*)
  2c028a6... Update Italian translation (*)
  976e989... Fix a deadlock resulting in no UI being shown on first run (*)
  c6197ad... Update ImapDb.Account hack to remove duplicate inboxes (*)
  a122f33... Merge branch 'wip/fix-first-run-deadlock' into 'mainline' (*)
  94a8aca... Merge branch 'wip/update-duplicate-inbox-hack' into 'mainli (*)
  52f0817... Fix Geary.Logging.Flag serialisation (*)
  006b4c5... Make App.ReseedOperation alway check the window for re-fill

(*) This commit already existed in another branch; no separate mail sent