Merge "Improve performance of logging logic in LightBarController" into udc-dev