Merge "NoMan: Cancel previous instance of ignored notification" into lmp-mr1-dev