Merge "Use display context all the way" into rvc-dev am: 214fe981 am: 6a6c04a5 am: 2131bbcd am: 680b24f5 Change-Id: Id0204ce04f651e60fd5e6c1298f0bc5e000804e6