Merge branch 'tizen' into tizen_5.5

Change-Id: Ida30ce4f794cc11cb23d375427538ee26ddbbbb7
Signed-off-by: Hwankyu Jhun <h.jhun@samsung.com>

diff --cc frame-broker/src/frame_broker.c
index d09aa9c19fd46f14cb7f33a6a76fb9ac3daa86d6,d16704980ef97a83d375e75a3f6ab23a4a84ce88..9711ba23d49a455f1f1cd58ca9e7200266bb53f4
--- 1/frame-broker/src/frame_broker.c
--- 2/frame-broker/src/frame_broker.c
+++ b/frame-broker/src/frame_broker.c
@@@ -178,22 -147,12 +147,18 @@@ static void __scls_stop_cb(uint32_t ser
        uint32_t ctx_serial = 0;
  
        _D("[__SCLS__] Stop");
-       if (context == NULL) {
-               if (broker->pre_context) {
-                       __check_pre_context(broker);
-                       context = broker->context;
-               } else {
-                       _E("Invalid context");
-                       return;
-               }
+       frame_context_get_serial(context, &ctx_serial);
+       if (ctx_serial != serial) {
+               _W("Skip! serial(%u:%u)", ctx_serial, serial);
+               return;
        }
  
 +      frame_context_get_serial(context, &ctx_serial);
 +      if (ctx_serial != serial) {
 +              _W("Skip! serial(%u:%u)", ctx_serial, serial);
 +              return;
 +      }
 +
        _D("Destroy context");
        frame_context_destroy(context);
        broker->context = NULL;