Merge "Toolbar text color always light" into udc-dev