Hm, maybe it's been fixed for clean installation or a new walkthroughs.
But in my case (1.05-1.06-walkthrough -> 1.07) it becomes even more broken than before. I did both quests before Triss had left Novigrad (1.05), then managed to Act 3 (1.07) and Nobleman Statuette quest reactivated again BUT with dialogs about Soldier Statuette, and in the quest I've met Soldier again. After that reactivated Nobleman Statuette quest stuck in my journal, although all checkmarks are green.
But in my case (1.05-1.06-walkthrough -> 1.07) it becomes even more broken than before. I did both quests before Triss had left Novigrad (1.05), then managed to Act 3 (1.07) and Nobleman Statuette quest reactivated again BUT with dialogs about Soldier Statuette, and in the quest I've met Soldier again. After that reactivated Nobleman Statuette quest stuck in my journal, although all checkmarks are green.