Merge "Ensure valid brightness is sent to surface control" into sc-dev