Merge "Account for vr virtual display" into oreo-cts-dev