Merge "hwc2: Do not honor cursor position when cursor layer is not present"