Merge "[UI][Modifier key remapping] Use new color token." into udc-dev