Merge "SyncPointerCapture (7/n): Clean up unused code from old Pointer Capture"