clutter-gtk: merge from poky