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

* commit '798c05523bc238853269a24dc526a31f0464a589':
  NoMan: Update effect suppressor on listener remove