Merge "Delay brightness change"