Merge branch 'devel/master' into tizen

Change-Id: If55cb93000e59c1f8d21b16f6b8051212b47b478

diff --cc dali/internal/window-system/tizen-wayland/ecore-wl2/window-system-ecore-wl2.cpp
index e0d133c,24a5afa..f7d57aa
--- 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
@@@ -66,9 -69,10 +69,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__);
      ecore_wl2_shutdown();
    }
  }