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