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

* commit '2d58c9220cdeaac63ae1a5c9f1c80c3e131ae296':
  NoMan: Update effect suppressor on listener remove