Merge "Consolidate statusbar/notification and notification/" into main