Merge "Fix lock task clearing for affiliated users" into udc-dev