Merge "Parameterize NotificationShadeWindowViewControllerTest" into main