Merge "Add null checks to desktop split interactions." into main