Merge "NoMan: Fix inconsistent notification comparator" into lmp-dev