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

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

Conflicts:
	dali-toolkit/internal/controls/text-input/text-input-decorator-impl.cpp
	dali-toolkit/internal/controls/text-input/text-input-impl.cpp
	dali-toolkit/internal/controls/text-input/text-input-impl.h
	dali-toolkit/internal/controls/text-input/text-input-popup-impl.cpp
	dali-toolkit/internal/controls/text-view/text-view-impl.cpp
	dali-toolkit/internal/controls/text-view/text-view-impl.h
	dali-toolkit/internal/controls/text-view/text-view-word-processor.cpp
	dali-toolkit/public-api/controls/text-input/text-input.h
	dali-toolkit/public-api/controls/text-view/text-view.h

Change-Id: I02bcdd172b1be75e3f6aa38c4dc8c55cdc076399