Merge "Unify the notification for the display errors" into main