Merge changes from topic "revert-27073971-JJCJUBPXEN" into main

* changes:
  Revert "Add GlowPieEffect (first pass)"
  Revert "Extract GlowPie to avoid code repetition."