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