Merge "Revert "Remove app cloning feature flags"" into udc-dev