Merge "hwc: Fix Line to Block switch on primary for targets with DMA Multiplexing"