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