Merge "Dali-toolkit: Text controls crash fix" into devel/master