Cyclic dependencies with \afterGrace and cross-staff notes

Hi all.  I've encountered a problem when using \afterGrace and cross-staff
notes.  It may  be related to these issues:

https://gitlab.com/lilypond/lilypond/-/issues/6171
https://gitlab.com/lilypond/lilypond/-/issues/6197

Here is the MWE:

%%%
\version "2.25.7"

rightHand = \relative {
  c''1~ \startTrillSpan |
  \afterGrace 15/16 c1 { b16[ \stopTrillSpan c] } |
  c8 g e c \change Staff = "lower" g e c g |
}

leftHand = \relative {
  \clef bass
  c4 c c c |
  c4 c c c |
  s1 |
}

\score {
  \new PianoStaff <<
    \new Staff = "upper" \rightHand
    \new Staff = "lower" \leftHand
  >>
}
%%%

This produces several programming errors:

programming error: cyclic dependency: calculation-in-progress encountered
for VerticalAxisGroup.adjacent-pure-heights

continuing, cross fingers

--
Knute Snortum