Merge "Clean up framework brightness system" into sc-dev