Merge "hwc2 : Add scope for wfd display lock"