variable_watch: Free memory when removing a watch
Merge topic 'dev/fix-variable-watch-crash' into next

3c25091 variable_watch: Free memory when removing a watch