Merge "Account for the bouncer's scrim in LightBarController" into udc-dev