Merge "Respect UI Context for getDisplay" into rvc-qpr-dev