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

Conflicts:
	automated-tests/src/dali-internal/utc-Dali-Internal-Text.cpp
	automated-tests/src/dali/utc-Dali-Text.cpp

Change-Id: I1c69565c7311266ba4786422932f969607d5fe0f

diff --cc automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.h
Simple merge

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

diff --cc dali/internal/common/core-impl.cpp
Simple merge

diff --cc dali/internal/common/core-impl.h
Simple merge

diff --cc dali/internal/event/effects/shader-effect-impl.cpp
Simple merge

diff --cc dali/internal/render/shaders/program.cpp
Simple merge

diff --cc dali/internal/update/resources/resource-manager.cpp
Simple merge