Merge "hwc2: add locks for callback functions" into rvc-dev