Merge "resourceloader: Remove creation of dynamic-styles marker"