Merge "Store user_set for notification listeners"