Merge "Ensure invalid brightness values aren't used" into udc-dev