Merge "Add notifications for the concurrent display mode"