Merge proposals dependent on lp://staging/~agateau/plasma-widget-message-indicator/fix-text-overlap-in-systemtray

1. fix-text-overlap-in-systemtray
2. Dependent merge proposals