Merge "Use display context all the way" into rvc-dev am: 214fe981 am: b9e806bb am: 6924f515 am: 04e3e83b Change-Id: I83772af2b4747513b4bfcf705daeff8824e4dfe2