Merge branch 'devel/master' into tizen

diff --cc build/tizen/CMakeLists.txt
Simple merge

diff --cc build/tizen/deps-check.cmake
Simple merge

diff --cc dali/devel-api/file.list
index 41be6eb,789939d..3530a68
--- 1/dali/devel-api/file.list
--- 2/dali/devel-api/file.list
+++ b/dali/devel-api/file.list
@@@ -2,10 -2,8 +2,11 @@@
  
  SET( devel_api_src_files
    ${adaptor_devel_api_dir}/adaptor-framework/accessibility-adaptor.cpp
+   ${adaptor_devel_api_dir}/adaptor-framework/animated-image-loading.cpp
    ${adaptor_devel_api_dir}/adaptor-framework/application-devel.cpp
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-group.cpp
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-item.cpp
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-manager.cpp
    ${adaptor_devel_api_dir}/adaptor-framework/bitmap-saver.cpp
    ${adaptor_devel_api_dir}/adaptor-framework/clipboard.cpp
    ${adaptor_devel_api_dir}/adaptor-framework/clipboard-event-notifier.cpp
@@@ -45,11 -42,9 +45,12 @@@ SET( devel_api_adaptor_framework_header
    ${adaptor_devel_api_dir}/adaptor-framework/accessibility-action-handler.h
    ${adaptor_devel_api_dir}/adaptor-framework/accessibility-gesture-handler.h
    ${adaptor_devel_api_dir}/adaptor-framework/accessibility-gesture-event.h
+   ${adaptor_devel_api_dir}/adaptor-framework/animated-image-loading.h
    ${adaptor_devel_api_dir}/adaptor-framework/application-devel.h
    ${adaptor_devel_api_dir}/adaptor-framework/atspi-accessibility.h
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-group.h
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-item.h
 +  ${adaptor_devel_api_dir}/adaptor-framework/autofill-manager.h
    ${adaptor_devel_api_dir}/adaptor-framework/bitmap-saver.h
    ${adaptor_devel_api_dir}/adaptor-framework/clipboard-event-notifier.h
    ${adaptor_devel_api_dir}/adaptor-framework/clipboard.h

diff --cc dali/integration-api/adaptor-framework/render-surface-interface.h
Simple merge

diff --cc dali/integration-api/adaptor-framework/scene-holder-impl.cpp
Simple merge

diff --cc dali/integration-api/adaptor-framework/scene-holder-impl.h
Simple merge

diff --cc dali/internal/window-system/common/window-base.h
Simple merge

diff --cc dali/internal/window-system/common/window-render-surface.cpp
Simple merge

diff --cc dali/internal/window-system/common/window-render-surface.h
Simple merge

diff --cc dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
Simple merge

diff --cc dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h
Simple merge

diff --cc dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
Simple merge

diff --cc dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h
Simple merge

diff --cc dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
Simple merge

diff --cc dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h
Simple merge

diff --cc dali/internal/window-system/windows/window-base-win.cpp
Simple merge

diff --cc dali/internal/window-system/windows/window-base-win.h
Simple merge

diff --cc packaging/dali-adaptor.spec
index 14df172,6d0908f..a7b1b4d
--- 1/packaging/dali-adaptor.spec
--- 2/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@@ -303,9 -303,9 +308,10 @@@ cmake_flags+=" -DCMAKE_INSTALL_PREFIX=$
  cmake_flags+=" -DCMAKE_INSTALL_LIBDIR=%{_libdir}"
  cmake_flags+=" -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}"
  cmake_flags+=" -DENABLE_TIZEN_MAJOR_VERSION=%{tizen_version_major}"
 +cmake_flags+=" -DENABLE_TIZEN_MINOR_VERSION=%{tizen_version_minor}"
  cmake_flags+=" -DENABLE_FEEDBACK=YES"
  cmake_flags+=" -DENABLE_APPFW=YES"
+ cmake_flags+=" -DCOMPONENT_APPLICATION_SUPPORT=YES"
  
  # Set up the build via Cmake
  #######################################################################