--- a/gfx/layers/apz/util/APZEventState.cpp
+++ b/gfx/layers/apz/util/APZEventState.cpp
@@ -277,17 +277,17 @@ APZEventState::ProcessTouchEvent(const W
 
   case NS_TOUCH_END:
     if (isTouchPrevented) {
       mTouchEndCancelled = true;
       mEndTouchIsClick = false;
     }
     // fall through
   case NS_TOUCH_CANCEL:
-    mActiveElementManager->HandleTouchEnd(mEndTouchIsClick);
+    mActiveElementManager->HandleTouchEndEvent(mEndTouchIsClick);
     // fall through
   case NS_TOUCH_MOVE: {
     SendPendingTouchPreventedResponse(isTouchPrevented, aGuid);
     break;
   }
 
   default:
     NS_WARNING("Unknown touch event type");
@@ -360,16 +360,17 @@ APZEventState::ProcessAPZStateChange(con
   case APZStateChange::StartPanning:
   {
     mActiveElementManager->HandlePanStart();
     break;
   }
   case APZStateChange::EndTouch:
   {
     mEndTouchIsClick = aArg;
+    mActiveElementManager->HandleTouchEnd();
     break;
   }
   default:
     // APZStateChange has a 'sentinel' value, and the compiler complains
     // if an enumerator is not handled and there is no 'default' case.
     break;
   }
 }

--- a/gfx/layers/apz/util/ActiveElementManager.cpp
+++ b/gfx/layers/apz/util/ActiveElementManager.cpp
@@ -104,19 +104,19 @@ ActiveElementManager::HandlePanStart()
 
   // The user started to pan, so we don't want mTarget to be :active.
   // Make it not :active, and clear any pending task to make it :active.
   CancelTask();
   ResetActive();
 }
 
 void
-ActiveElementManager::HandleTouchEnd(bool aWasClick)
+ActiveElementManager::HandleTouchEndEvent(bool aWasClick)
 {
-  AEM_LOG("Touch end, aWasClick: %d\n", aWasClick);
+  AEM_LOG("Touch end event, aWasClick: %d\n", aWasClick);
 
   // If the touch was a click, make mTarget :active right away.
   // nsEventStateManager will reset the active element when processing
   // the mouse-down event generated by the click.
   CancelTask();
   if (aWasClick) {
     SetActive(mTarget);
   } else {
@@ -124,16 +124,23 @@ ActiveElementManager::HandleTouchEnd(boo
     // so we set the element active right away. Now it turns out the
     // action was not a click so we need to reset the active element.
     ResetActive();
   }
 
   ResetTouchBlockState();
 }
 
+void
+ActiveElementManager::HandleTouchEnd()
+{
+  AEM_LOG("Touch end, clearing pan state\n");
+  mCanBePanSet = false;
+}
+
 bool
 ActiveElementManager::ActiveElementUsesStyle() const
 {
   return mActiveElementUsesStyle;
 }
 
 static nsPresContext*
 GetPresContextFor(nsIContent* aContent)

--- a/gfx/layers/apz/util/ActiveElementManager.h
+++ b/gfx/layers/apz/util/ActiveElementManager.h
@@ -28,36 +28,42 @@ class ActiveElementManager {
   ~ActiveElementManager();
 public:
   NS_INLINE_DECL_REFCOUNTING(ActiveElementManager)
 
   ActiveElementManager();
 
   /**
    * Specify the target of a touch. Typically this should be called right
-   * before HandleTouchStart(), but we give callers the flexibility to specify
-   * the target later if they don't know it at the time they call
-   * HandleTouchStart().
+   * after HandleTouchStart(), but in cases where the APZ needs to wait for
+   * a content response the HandleTouchStart() may be delayed, in which case
+   * this function can be called first.
    * |aTarget| may be nullptr.
    */
   void SetTargetElement(dom::EventTarget* aTarget);
   /**
-   * Handle a touch-start event.
+   * Handle a touch-start state notification from APZ. This notification
+   * may be delayed until after touch listeners have responded to the APZ.
    * @param aCanBePan whether the touch can be a pan
    */
   void HandleTouchStart(bool aCanBePan);
   /**
    * Handle the start of panning.
    */
   void HandlePanStart();
   /**
    * Handle a touch-end or touch-cancel event.
    * @param aWasClick whether the touch was a click
    */
-  void HandleTouchEnd(bool aWasClick);
+  void HandleTouchEndEvent(bool aWasClick);
+  /**
+   * Handle a touch-end state notification from APZ. This notification may be
+   * delayed until after touch listeners have responded to the APZ.
+   */
+  void HandleTouchEnd();
   /**
    * @return true iff the currently active element (or one of its ancestors)
    * actually had a style for the :active pseudo-class. The currently active
    * element is the root element if no other elements are active.
    */
   bool ActiveElementUsesStyle() const;
 private:
   /**