Merge "Add filtering for notification receivers"