Merge "hwc: Validate display ID in hwc interfaces"