Merge "hwc: Fix issue with Layercache"