Merge "ECM notification is not displayed when the user is NOT the primary one"