Merge "Fix NPE in DozeTriggers and Add Tests"