Merge "Revert "Remove unused resources"" into sc-dev