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

Change-Id: I6c999a970a309f7888d6157c7a17f5d0ca05e32c