Merge "Fix notification grouping and section bug" into rvc-dev