Merge "CMake fix after dali2 rename." into devel/master