Merge "Add idle screen brightness mapping to DPC"