Merge "Rework Notification Sectioning"