Merge "Fix KeyboardFocusManager custom algorithm reset" into devel/master

diff --combined dali-csharp-binder/src/dali_wrap.cpp
index 143ae9e,e01367b..aa15bcf
--- 1/dali-csharp-binder/src/dali_wrap.cpp
--- 2/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@@ -68208,11 -68208,12 +68208,11 @@@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali
    Dali::Property::Index arg3 = 0 ;
    arg3 = (Dali::Property::Index)jarg3;
  
 -  Dali::Property::Value arg4;
 -  arg4 = (Dali::Property::Value *)jarg4;
 +  Dali::Property::Value *arg4 = (Dali::Property::Value *)jarg4;
  
    {
      try {
 -      DevelControl::DoAction(arg1, arg2, arg3, arg4);
 +      DevelControl::DoAction(arg1, arg2, arg3, *arg4);
      } catch (std::out_of_range& e) {
        {
          SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return ;
@@@ -92325,10 -92326,7 +92325,7 @@@ SWIGEXPORT void SWIGSTDCALL CSharp_Dali
    }
    arg1 = *argp1;
    arg2 = (Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface *)jarg2;
-   if (!arg2) {
-     SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::DevelKeyboardFocusManager::CustomAlgorithmInterface & type is null", 0);
-     return ;
-   }
+   //Null checking of arg2 is removed. arg2's null set means resetting so it can be a null value.
    {
      try {
        Dali::Toolkit::DevelKeyboardFocusManager::SetCustomAlgorithm(arg1,*arg2);