Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-20210412' into staging