Fix regressions compared to 5.18

Fabian Vogtrequested to merge
work/userfix into Plasma/5.19

See the commits for a description.

Merge request reports