Merge "Fix NotificationProgressBar tracker updating issues." into main