Merge "Add DALI_EXPORT_API to main()" into devel/master