Merge "Ensure cursor positioned at end of selection when focus restored" into devel...

diff --combined dali-toolkit/internal/text/text-controller-impl.cpp
index 7dd88e4,2b04538..67eb294
--- 1/dali-toolkit/internal/text/text-controller-impl.cpp
--- 2/dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/dali-toolkit/internal/text/text-controller-impl.cpp
@@@ -1053,6 -1053,9 +1053,9 @@@ void Controller::Impl::RepositionSelect
  
    mEventData->mDecorator->SetPosition( RIGHT_SELECTION_HANDLE, secondaryPosition.x, secondaryPosition.y, secondaryCursorInfo.lineHeight );
  
+   // Cursor to be positioned at end of selection so if selection interrupted and edit mode restarted the cursor will be at end of selection
+   mEventData->mPrimaryCursorPosition = (indicesSwapped)?mEventData->mLeftSelectionPosition:mEventData->mRightSelectionPosition;
+ 
    // Set the flag to update the decorator.
    mEventData->mDecoratorUpdated = true;
  }
@@@ -1709,7 -1712,7 +1712,7 @@@ void Controller::Impl::UpdateCursorPosi
      return;
    }
  
 -  if( IsShowingPlaceholderText() )
 +  if( IsShowingPlaceholderText() || ( 0u == mLogicalModel->mText.Count() ) )
    {
      // Do not want to use the place-holder text to set the cursor position.