Merge branch 'devel/master' into devel/vulkan

Change-Id: Id908c078a78f485d7b0d726ca84c69aff61528b5

diff --cc automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
Simple merge

diff --cc automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-vector-animation-renderer.cpp
Simple merge

diff --cc automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
Simple merge

diff --cc dali-toolkit/devel-api/controls/text-controls/text-field-devel.h
Simple merge

diff --cc dali-toolkit/internal/controls/text-controls/text-field-impl.cpp
Simple merge

diff --cc dali-toolkit/internal/controls/text-controls/text-field-impl.h
Simple merge

diff --cc dali-toolkit/internal/text/markup-processor.cpp
Simple merge

diff --cc dali-toolkit/internal/text/text-controller-impl.cpp
Simple merge

diff --cc dali-toolkit/internal/visuals/animated-vector-image/animated-vector-image-visual.cpp
Simple merge

diff --cc dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.cpp
Simple merge

diff --cc dali-toolkit/internal/visuals/animated-vector-image/vector-rasterize-thread.h
Simple merge

diff --cc packaging/dali-toolkit.spec
index 023b13546567a2982d3f2dd88be04fa3e7ed72cd,7a01661a6cd67d5e49f884d89488878661444a6f..289b86104afedb99b3a9c03aa3780a34a81c1ae6
--- 1/packaging/dali-toolkit.spec
--- 2/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@@ -1,6 -1,6 +1,6 @@@
 -Name:       dali-toolkit
 +Name:       dali-toolkit-vk
  Summary:    Dali 3D engine Toolkit
- Version:    1.4.14
+ Version:    1.4.16
  Release:    1
  Group:      System/Libraries
  License:    Apache-2.0 and BSD-3-Clause and MIT