Merge "Handle non-split pointers for multi-device case" into main