Merge tizen branch into tizen_5.5_devel branch