Merge "BrightnessTracker should accomodate multiple ambient sensors" into tm-qpr-dev