Merge "Resolve cases for strikethrough when using multiple <s> tags" into devel/master

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

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

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

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