Merge "NoMan: Allow listeners to specify notification trim" into lmp-dev