Merge "[sf] resolve handles to layer ids in binder thread" into udc-dev