Merge "surface_control: handle acquire fence on BLAST callbacks"