ECMS-4332 Watch/Unwatch popup and notification