Merge branch 'upstream/1.22.7' into tizen_gst_1.22.7