Merge "Revert "Move Some Devel Properties & APIs to the Public API"" into devel/master

diff --combined dali-toolkit/devel-api/file.list
index e7ec321,a995986..0bfd7d4
--- 1/dali-toolkit/devel-api/file.list
--- 2/dali-toolkit/devel-api/file.list
+++ b/dali-toolkit/devel-api/file.list
@@@ -28,6 -28,7 +28,7 @@@ devel_api_src_files = 
    $(devel_api_src_dir)/image-loader/async-image-loader-devel.cpp \
    $(devel_api_src_dir)/image-loader/atlas-upload-observer.cpp \
    $(devel_api_src_dir)/image-loader/image-atlas.cpp \
+   $(devel_api_src_dir)/image-loader/texture-manager.cpp \
    $(devel_api_src_dir)/scripting/script.cpp \
    $(devel_api_src_dir)/styling/style-manager-devel.cpp \
    $(devel_api_src_dir)/transition-effects/cube-transition-cross-effect.cpp \
@@@ -106,7 -107,8 +107,8 @@@ devel_api_focus_manager_header_files = 
  devel_api_image_loader_header_files = \
    $(devel_api_src_dir)/image-loader/async-image-loader-devel.h \
    $(devel_api_src_dir)/image-loader/atlas-upload-observer.h \
-   $(devel_api_src_dir)/image-loader/image-atlas.h
+   $(devel_api_src_dir)/image-loader/image-atlas.h \
+   $(devel_api_src_dir)/image-loader/texture-manager.h
  
  devel_api_scripting_header_files = \
    $(devel_api_src_dir)/scripting/script.h \
@@@ -128,7 -130,6 +130,7 @@@ devel_api_super_blur_view_header_files 
  
  devel_api_text_controls_header_files = \
    $(devel_api_src_dir)/controls/text-controls/text-editor-devel.h \
 +  $(devel_api_src_dir)/controls/text-controls/text-field-devel.h \
    $(devel_api_src_dir)/controls/text-controls/text-label-devel.h \
    $(devel_api_src_dir)/controls/text-controls/text-selection-popup.h \
    $(devel_api_src_dir)/controls/text-controls/text-selection-toolbar.h