Merge "Fix strides while extracting graphic buffer" into oc-dev