Merge "resourceloader: Un-deprecate ClientHtml::setModuleStyles()"