Merge "Reconcile drag-to-open and touch event interception" into klp-dev