Merge "Basic pan-gesture resampling for when prediction is off" into devel/master