Merge "Extract NotificationClicker from NEM"