Merge "evas_object_smart - trivial changes"