Merge "Use correct user id when checking uri grants for notification." into nyc-dev