Merge branch 'devel/master' into tizen_9.0

Change-Id: I2a63a52e91d7264715cc8cb45f0d09e51ce7fc06

diff --cc dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp
index f7d57aa791e372a233fa83ecb466c18472a1cb9e,adc78538e9cc251255c30d41306cad6946cda394..c2aea06a94debdb80d22311eece7358e5517ae70
--- 1/dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp
--- 2/dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp
+++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp
@@@ -69,10 -70,10 +70,10 @@@ void Initialize(
  
  void Shutdown()
  {
 -  auto frameworkFactory = Dali::Internal::Adaptor::GetFrameworkFactory();
 -  if(frameworkFactory == nullptr || (frameworkFactory && frameworkFactory->GetFrameworkBackend() == FrameworkBackend::DEFAULT))
 +  auto backend = Dali::Internal::Adaptor::GetFrameworkFactory()->GetFrameworkBackend();
 +  if(backend == FrameworkBackend::DEFAULT)
    {
-     print_log(DLOG_INFO, "DALI", "%s: %s(%d) > ecore_wl2_shutdown()", __MODULE__, __func__, __LINE__);
+     print_log(DLOG_INFO, "DALI", DALI_LOG_FORMAT_PREFIX "ecore_wl2_shutdown()", DALI_LOG_FORMAT_PREFIX_ARGS);
      ecore_wl2_shutdown();
    }
  }