Merge "hwc2: Fix the single-buffer layer use case"