Merge "Move window drag instrumentation to drag position move callback." into main