Merge "Filter notification APIs by user" into sc-dev