Merge "hwc2: Add check for null display in PresentDisplay"