Merge "Respect halControlsIllumination provided by the HAL" into tm-dev