Merge "Fix missing null check in collectRootScrollCaptureTargets"