Merge change 7473 into donut

* changes:
  Fixes #1844366. Prevents window leak in Spinner.