Merge "Recover tracking pointer going up mid-gesture in shade." into klp-dev