[18.04.1] Nm-applet works fine but shows 2 icons in the system tray



I wanted to reply to this other post regarding the exact same bug, but that seems to have been locked/closed. That thread suggests that the issue was fixed upstream and even made it to 17.04, but I still faced this issue recently, not just on UbuntuMATE 18.04, but Xubuntu 18.04 too!

So, is the upstream fix yet to be included in the 18.04 version, or is this a reoccurring once again?