Merge "Move NIC binding to NotificationShelfViewBinder" into main