OK, so upstream here is what we have done (pretty much your suggested W/A).
main: https://github.com/fwupd/fwupd/commit/7b0d6bc6e03381544e3fb1836c177d492c9d0bbc https://github.com/fwupd/fwupd/commit/e90b04d7319874db36c06245ab07858589ce8bc8 https://github.com/fwupd/fwupd/commit/f818404d817f6f36699807424cd1d9b84c9be752
backported to 1_7_X (which can SRU to Ubuntu): https://github.com/fwupd/fwupd/commit/e6ea2916b1f7e1b26eefd6e2e762a9a26492ffaa https://github.com/fwupd/fwupd/commit/3c72bcc181470c5a9f1f01fbd9826fa6f7e37cc1 https://github.com/fwupd/fwupd/commit/7bb2f00ca96fb23f7de88c64353916436b2504bb
OK, so upstream here is what we have done (pretty much your suggested W/A).
main: /github. com/fwupd/ fwupd/commit/ 7b0d6bc6e033815 44e3fb1836c177d 492c9d0bbc /github. com/fwupd/ fwupd/commit/ e90b04d7319874d b36c06245ab0785 8589ce8bc8 /github. com/fwupd/ fwupd/commit/ f818404d817f6f3 6699807424cd1d9 b84c9be752
https:/
https:/
https:/
backported to 1_7_X (which can SRU to Ubuntu): /github. com/fwupd/ fwupd/commit/ e6ea2916b1f7e1b 26eefd6e2e762a9 a26492ffaa /github. com/fwupd/ fwupd/commit/ 3c72bcc181470c5 a9f1f01fbd9826f a6f7e37cc1 /github. com/fwupd/ fwupd/commit/ 7bb2f00ca96fb23 f7de88c64353916 436b2504bb
https:/
https:/
https:/