am 8a733e8f: Merge change 7473 into donut

Merge commit '8a733e8fa2b2e6c1404ca536da645e897405eb5f'

* commit '8a733e8fa2b2e6c1404ca536da645e897405eb5f':
  Fixes #1844366. Prevents window leak in Spinner.