Merge "Make ScreenUndimDetector only trigger on default display group"