Merge "Enable resampling for palm rejection"