Merge "Update BrightnessTrackerTest" into sc-dev