Merge "Add tracker to NotificationProgressBar." into main