Merge "Cleaned up notification group handling with HUNS" into nyc-dev