Merge "NoMan: Optimize grouped notifications" into lmp-mr1-dev