Merge "hwc2 : Fix fence management issue during power state change" into display.lnx.5.1