Merge "Update icons for concurrent display notifications"