Merge "hwc2: Switch vsync source to next active display"