Merge "Handle Emoji clustering for cursor handling" into devel/master

diff --cc dali-toolkit/internal/file.list
Simple merge

diff --cc dali-toolkit/internal/text/cursor-helper-functions.cpp
index 3b3bf44,d895418..5dfebde
--- 1/dali-toolkit/internal/text/cursor-helper-functions.cpp
--- 2/dali-toolkit/internal/text/cursor-helper-functions.cpp
+++ b/dali-toolkit/internal/text/cursor-helper-functions.cpp
@@@ -22,8 -22,9 +22,10 @@@
  #include <dali/integration-api/debug.h>
  
  // INTERNAL INCLUDES
+ #include <dali-toolkit/internal/text/characters-helper-functions.h>
+ #include <dali-toolkit/internal/text/emoji-helper.h>
  #include <dali-toolkit/internal/text/glyph-metrics-helper.h>
 +#include <dali-toolkit/internal/text/rendering/styles/character-spacing-helper-functions.h>
  
  namespace
  {

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