Merge "resourceloader: Track state of page-style modules"