Merge "hwc: Fix right mixer layer positioning."