Merge "hwc: Do not overwrite retireFenceFd if already set"