Merge "Restore selected color position" into udc-dev