Merge "Use display context all the way"