Merge "Move GestureListener to own file."