Merge "Fix missing inclusion of players to faded out list" into main