Merge "DO NOT MERGE Filter out suppressed notifications in entry manager" into rvc-d1-dev