Merge "Update the work icon." into oc-mr1-dev