Merge "Fix NPE: NotificationEntry.isStickyAndNotDemoted" into main