Merge "hwc2: Fix the non-secure WriteBack output use case"