Merge "Fix missing header text in notification groups" into nyc-dev