Merge "Merge "Use context for correct display in the renderer service" into rvc-dev am: 85cbe43d am: 2c738c0f am: cac72bd3" into rvc-qpr-dev-plus-aosp