Merge "Update color option tiles to match GM3 colors (1/3)" into udc-dev