Merge "InputDispatcher: Do not drop ongoing gesture if a window is no longer a spy" into tm-dev