Merge "Update note task icons" into udc-dev