Merge "Fix the issue where the first brightness for a device was set to 0"