Merge "hwc2: Locking fixes"