Merge "Update colors for edit state" into udc-dev