Merge "Use context for correct display in the renderer service" into rvc-dev am: 85cbe43d am: 3ce21f71 Change-Id: I06b61da2789b50987d766e0825041edeccefde3e