Aleix Pol Gonzalez authored May 30, 2022 and Aleix Pol Gonzalez committed May 30, 2022

Since the codebases had diverged over time, I've backported it by hand
using the same concepts as the forementioned fix, trying to minimise the
delta with the latest released Plasma 5.24.