Merge "Use display context all the way" into rvc-dev