Merge "Fixes again outlineVariant on DynamicColor" into udc-dev