Merge "Use context for correct display in the renderer service" into rvc-dev