[gnome-software: 2/2] Merge branch '1422-followup' into 'main'

[Milan Crha <mcrha src gnome org>]

commit a2e923c7e5e760398d029a1d1ccefa0f675b1117
Merge: 9a1d3e7b9 68b955bb7
Author: Milan Crha <mcrha redhat com>
Date:   Tue Sep 21 12:24:46 2021 +0000

    Merge branch '1422-followup' into 'main'
    
    appstream: Ensure XbBuilders are constructed in the right context
    
    Closes #1422
    
    See merge request GNOME/gnome-software!993

 plugins/core/gs-plugin-appstream.c | 13 ++++++++++++-
 plugins/flatpak/gs-flatpak.c       | 26 ++++++++++++++++++++++++--
 2 files changed, 36 insertions(+), 3 deletions(-)
---