Merge "Moved SingletonService into dali-core" into devel/master