Merge branch 'tizen_6.0' into tizen

Change-Id: I48c07c4d80a6cc92c4daa50f3dd61148fd38a494

diff --cc src/option.cpp
index 19c0680,2d51b89..aca608a
--- 1/src/option.cpp
--- 2/src/option.cpp
+++ b/src/option.cpp
@@@ -1726,22 -1750,9 +1738,21 @@@ option_window_created(Evas_Object *wind
  
  #ifdef _TV
      option_elements[type].back_button = naviframe_item_push(naviframe, OPTIONS, mlayout, NULL, NULL, navi_back_cb, NULL, EINA_FALSE);
- 
  #else
 +    Evas_Object *nf_content = NULL;
      Evas_Object *list = create_option_main_view(conformant, naviframe, type);
 -    option_elements[type].back_button = naviframe_item_push(naviframe, OPTIONS, list, NULL, NULL, navi_back_cb, NULL);
 +    nf_content = list;
 +
 +#ifdef _COMMON
 +    Evas_Object *layout = elm_layout_add(naviframe);
 +    elm_layout_file_set(layout, OPTION_LAYOUT_EDJ, "main_layout");
 +    elm_object_content_set(layout, list);
 +    evas_object_show(layout);
 +
 +    nf_content = layout;
 +#endif
 +
 +    option_elements[type].back_button = naviframe_item_push(naviframe, OPTIONS, nf_content, NULL, NULL, navi_back_cb, NULL);
      elm_object_content_set(conformant, naviframe);
  #endif