Merge "Fix double wallpaper attachment (race) when it is gone"