Merge "SceneContainer now depends on NotificationsHeadsUpRefactor" into main