Merge "Enable SC registry in the Shell" into udc-dev