Fix merge issue with player-legacy.h