Merge "PlayerBase: unregistration in player release"