Merge "Fix resampling for multiple pointers" into oc-mr1-dev am: c278874239  -s ours
am: f5c7aff34f  -s ours

Change-Id: I3514d653f48b2b629a0265072fe43b31ba9c07fe