Revert "Revert "NotificationHelper: We shouldn't use logical here, one case is enough no matter the order""

This reverts commit 7274b09301c5090f14ee2af7d345e97f764c8ae9.

Change-Id: Ibb58f66a7059ca92a44852d0e9d80ace2808cf7a