Merge branch 'devel/master' into tizen

Change-Id: Icf648f8ecba282bd38c6aac8b10e49ac83cdbe5b

diff --cc dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
index d58560d,15e5366..cbd831d
--- 1/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
--- 2/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
+++ b/dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.cpp
@@@ -114,10 -114,10 +114,10 @@@ KeyboardFocusManager::KeyboardFocusMana
    mFocusChangedSignal(),
    mFocusGroupChangedSignal(),
    mFocusedActorEnterKeySignal(),
-   mCurrentFocusActor( 0 ),
+   mCurrentFocusActor(),
    mFocusIndicatorActor(),
    mFocusGroupLoopEnabled( false ),
 -  mIsFocusIndicatorEnabled( false ),
 +  mIsFocusIndicatorEnabled( true ),
    mIsWaitingKeyboardFocusChangeCommit( false ),
    mFocusHistory(),
    mSlotDelegate( this ),