Merge "Use context for correct display in the renderer service" into rvc-dev am: 85cbe43d am: 2c738c0f Change-Id: I29687f9969e4a7ace9751e23742c72df8fe86a0e