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