Merge "hwc2: Remove double scope-locking"