Merge "Shorter scrim delay if display is on"