Merge "Re-enable SharedNotificationContainerViewModelTest tests" into main