Merge "BrightnessTracker should accomodate multiple ambient sensors"