Merge "Use userid of sender, not notification target."