Merge remote-tracking branch 'origin/tizen' into new_text

Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
	automated-tests/src/dali-unmanaged/CMakeLists.txt
	automated-tests/src/dali-unmanaged/dali-test-suite-utils/test-platform-abstraction.cpp
	automated-tests/src/dali-unmanaged/dali-test-suite-utils/test-platform-abstraction.h
	automated-tests/src/dali/CMakeLists.txt
	automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
	automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
	automated-tests/src/dali/utc-Dali-Utf8.cpp
	dali/internal/event/actors/text-actor-impl.cpp
	dali/internal/event/actors/text-actor-impl.h
	dali/public-api/actors/text-actor.h

Change-Id: I58b15a5d241a8475fa89db1d9a07b76700b981f2