Merge "Handle multi-user in notif log"