Merge "Remove evas dependency" into devel/master