Follow on commit for a regression caused by fixing UPnP action to remove unused event variables