Merge "Add config to control app cloning building blocks" into udc-dev