Merge "resourceloader: Remove support for $context === null in getContentObj"