Diffusion KWin 7ce380497f84

Merge branch 'allactivities'

Authored by Chani Armitage <chanika@gmail.com>.