Merge "Fix resampling for multiple pointers" into oc-mr1-dev