Merge "Use profile badge without background for notification history" into main