hwc: Fix sync merge and sync wait logics.

CRs-Fixed: 2579548
Change-Id: I92e2316053c154ffb445382f031c6b6f65226c01
1 file changed