Merge "Avoid binder call while dragging" into pi-dev