Merge "Enable concurrent display notifications"