When detaching player, set to null before clean-up

Otherwise, its possible for queued stuff to start collecting
during clean-up and then they will report to the new player
after it is replaced.

Bug: 278781290
Test: Wait to see if metric reduces?
Change-Id: I37f28b5daed6946675751b9fb430860c3331048a