Merge "When detaching player, set to null before clean-up" into udc-dev