Merge "Store Brightness Per Display" into sc-dev