Merge "hwc: Clean up ExternalDisplay class"