[geary/geary-0.12: 2/2] Merge branch 'cherry-pick-adf21161' into 'geary-0.12'

[Michael Gratton <mjog src gnome org>]

commit 9f7aa0c99a90c33a822067fcf85ea142d5a47015
Merge: 2986e404 4be93c14
Author: Michael Gratton <mike vee net>
Date:   Tue Oct 9 10:07:12 2018 +0000

    Merge branch 'cherry-pick-adf21161' into 'geary-0.12'
    
    Merge branch 'faster-folder-switching' into 'geary-012'
    
    See merge request GNOME/geary!43

 src/client/application/geary-controller.vala | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)
---