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