Merge "Be more strict about triggering notification lights" into pi-dev am: f00bfbe46e
am: 89e2a45c20

Change-Id: Ieea3c2a7b4c2d7b34bcece6ac14a566f66de29a9