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