Merge "NoMan: Update effect suppressor on listener remove" into lmp-mr1-dev