Merge "Changes following dali-core patch "Renamed enum Geometry::GeometryType to...