Merge remote-tracking branch 'origin/tizen' into tizen_5.5

Signed-off-by: hyunho <hhstark.kang@samsung.com>

diff --cc screen_connector_remote_surface/remote_surface.cc
Simple merge

diff --cc screen_connector_remote_surface_evas/remote_surface_mixed.cc
index ddd9723daff154614683a86302b468e888828351,37642c85bd8b4e3cbc57b15446813255b2450dac..4c02f57eb296c71c23f44dd18d813537ca587908
--- 1/screen_connector_remote_surface_evas/remote_surface_mixed.cc
--- 2/screen_connector_remote_surface_evas/remote_surface_mixed.cc
+++ b/screen_connector_remote_surface_evas/remote_surface_mixed.cc
@@@ -74,9 -74,10 +74,10 @@@ void RemoteSurfaceMixed::OnBufferChange
      }
      img_tbm_->UpdateTbm(tbm);
      listener_->OnWatcherChanged(GetAppId(), GetInstId(), GetPid(), *(img_tbm_));
+     is_file_ = false;
    } else {
      if (img_file_.get() == nullptr) {
 -        LOGD("first added !!!! %d %s", type, GetAppId().c_str());
 +        LOGI("first added !!!! %d %s", type, GetAppId().c_str());
          if (img_tbm_.get() != nullptr) {
              listener_->OnWatcherRemoved(GetAppId(), GetInstId(), GetPid());
              img_tbm_.reset();