Merge "Enable per display brightness setting" into sc-dev