Merge "dma-buf/sync_file: Register the merged fence for callbacks" into msm-4.9