Merge "[DO NOT MERGE] Fix broken NotificationPanelViewControllerTest" into sc-v2-dev