Move notification filtering somewhere it can be found

Change-Id: I17c965a70875a5a9ea5a00a5bd57c19d1f19a1a1
Merge remote-tracking branch 'upstream/kk44' into kk44