Merge "Increase Night Display transition to 3 seconds"