Merge "Updating overview colors to utilize new tokens" into udc-dev