Merge "Fix AutomaticBrightnessControllerTest" into sc-dev