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

* commit 'cefee0c8185594f017ffd396cfe1877419c24371':
  Remember userId when stripping / rebuilding notification.