Cherry pick :restart notificaiton related changes