Merge "Account for padding in dispatchScrollCaptureSearch" into sc-dev