Merge "[NotificationHeader] Fix NotifHeader and LargeIcon conflict" into main