Merge "Do not transition from gesture detection state after gesture cancelation."