Merge "Merge "Use isolated display context to get display info" into rvc-dev am: 7f5a670cc3 am: 9aadcc0d6c am: 6118bad6f3" into rvc-qpr-dev-plus-aosp