Merge "Added check for config change in RendererManager"