Merge "Use display context all the way" into rvc-dev am: 214fe981 am: b9e806bb am: 74ab3c0c am: 91c62d8f Change-Id: I0c2dd56f98603b179423be570e2288b05daadbd6