Merge "Fix notifications that are sent for USER_ALL." into nyc-dev