Merge "Flags for brightness slider" into sc-dev