Merge "hwc: split display: Fix flip on which to do crop swap"