Merge "Remember userId when stripping / rebuilding notification." into lmp-dev